diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2012-11-27 11:23:39 -0800 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2012-11-27 11:23:39 -0800 |
| commit | 34748e03d14550671c00f200c8310cc5bda4ee56 (patch) | |
| tree | ada0497da9fc09922b165cb8b75fb14cdd50ee00 /.gitignore | |
| parent | 1f39883bc656605ecde816fc1f5238ff86b83e53 (diff) | |
| parent | 0bfd1c210962d38bca5e5f4a8815b5b45e1f69df (diff) | |
| download | libnet-34748e03d14550671c00f200c8310cc5bda4ee56.tar.gz | |
Merge branch 'win32'
Conflicts were in error message formatting, master has removed
new lines from end of all error messages.
Conflicts:
libnet/src/libnet_if_addr.c
libnet/src/libnet_link_win32.c
libnet/src/libnet_resolve.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,8 +1,12 @@ *.a +*.dll +*.exp *.la +*.lib *.lo *.loT *.o +*.obj *.out.dSYM *.so.dSYM *~ @@ -32,6 +36,7 @@ libnet/doc/html/*.html libnet/doc/html/*.png libnet/doc/man/man3/*.3 libnet/include/libnet.h +libnet/include/libnet/stdint.h libnet/m4 libnet/sample/arp libnet/sample/bgp4_hdr |