Merge branch 'master' of https://github.com/sgeto/libnet into sgeto-master

Conflicts:
	.gitignore
	.travis.yml
	BUILD-FROM-GIT.txt
	Makefile.am
	Makefile.am.common
	Prepare
	acinclude.m4
	autogen.sh
	configure.ac
	doc/html/Makefile.am
	doc/html/closed.png
	doc/html/globals_func.html
	doc/html/tab_s.png
	doc/libnet.doxygen.conf
	doc/man/Makefile.am
	doc/man/man3/Makefile.am
	doc/man/man3/libnet-functions.h.3
	doc/man/man3/libnet-macros.h.3
	include/libnet.h
	include/libnet/Makefile.am
	libnet/acinclude.m4
	libnet/libnet-config.in
	libnet/m4/acinclude.m4
	lua/Makefile
	lua/msvcbuild.bat
	sample/Makefile.am
	scripts/Push
	src/libnet_link_win32.c
	win32/Makefile.am

1 files changed, 15 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index bf2f988..34c92e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-*.a
+*.la
 *.dll
+*.exe
 *.exp
-*.la
-*.lib
 *.lo
 *.loT
 *.o
@@ -15,9 +14,11 @@
 Makefile
 Makefile.in
 aclocal.m4
+ar-lib
 autom4te.cache
+compile
+config.cache
 config.guess
-config.h.in
 config.log
 config.status
 config.sub
@@ -32,20 +33,21 @@ libnet-1.?
 libnet-1.?.?
 libnet-1.?.?.tar.gz
 libnet-1.?.tar.gz
-libnet/*-stamp
-compile
-debian
-doc/html/*.css
-doc/html/*.gif
-doc/html/*.html
-doc/html/*.js
-doc/html/*.png
-doc/man/man3/*.3
+libtool
+ltmain.sh
+missing
+stamp-*
+tags
+version.h
+
+include/config.h.in
 include/config.h
 include/getopt.h
 include/libnet.h
 include/libnet/stdint.h
+
 m4
+
 sample/arp
 sample/bgp4_hdr
 sample/bgp4_notification
@@ -94,10 +96,3 @@ sample/tring_tcp1
 sample/tring_tcp2
 sample/udp1
 sample/udp2
-libtool
-ltmain.sh
-lua/net.so
-missing
-stamp-*
-tags
-version.h