Remove DISSECTOR_ASSERT since private_data isn't being used anymore to transport...

[metze/wireshark/wip.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cbe8711d85b6e7b73f3dcde62067097edf2e6d74..6e63f186e3d96fec6f2c1793177a11d04f52cd46 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,11 @@
 *.dll
 *.exe
 *.la
+*.lai
 *.lo
 *.obj
 *.pyc
-*.so
+*.so*
 *.[oa]
 *grammar.out
 *grammar.[ch]
@@ -15,6 +16,8 @@
 *_lex.h
 epan/declare_wslua.h
 epan/dissectors/dcerpc/idl2wrs
+epan/dissectors/mesa
+epan/dissectors/xcbproto
 epan/dissectors/packet-ncp2222.c
 epan/dissectors/register-cache.pkl
 epan/dissectors/register.c
@@ -34,10 +37,12 @@ epan/wslua/init.lua
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
 epan/wslua/taps_wslua.c
+epan/ps.c
+ui/cli/tshark-tap-register-cache.pkl
 ui/gtk/wireshark-tap-register.c
+ui/gtk/wireshark-tap-register-cache.pkl
 plugin.c
 plugins/mate/mate_parser.c
-ps.c
 svnversion.h
 tools/lemon/lemon
 tools/lemon/lemon
@@ -73,10 +78,14 @@ mergecap
 missing
 randpkt
 rawshark
+reordercap
+reassemble_test
 stamp-h1
 text2pcap
 tshark
+tvbtest
 wireshark
+wmem_test
 ylwrap
 
 
@@ -110,21 +119,62 @@ wireshark.pod
 # Qt #
 ######
 qtshark
+*.rcc.cpp
+/ui/qt/__/
 /ui/qt/*.qrc.depends
 /ui/qt/*.pro.user
+#/ui/qt/*.qm
 /ui/qt/moc_*.cpp
+/ui/qt/*.moc.cpp
 /ui/qt/moc_*.cxx
 /ui/qt/qrc_*.cpp
 /ui/qt/qrc_*.cxx
 /ui/qt/ui_*.h
+/ui/qt/console.lua
+/wireshark-qt*
+
+# abi #
+#######
+epan/abi-check-headers/
+epan/abi-descriptor.xml
+wiretap/abi-check-headers/
+wiretap/abi-descriptor.xml
+wsutil/abi-check-headers/
+wsutil/abi-descriptor.xml
+
+# Windows Stuff #
+#################
+*.bsc
+*.chm
+*.dsp
+*.dsw
+*.chm
+*.exp
+*.lib
+*.ilk
+*.manifest
+*.pdb
+*.rc
+!adns_dll.rc
+!image/file_dlg_win32.rc
+*.res
+*.manifest
+_libs_check_
+/wireshark-gtk*
+doc/ws.css
+ui/qt/config.pri
 
 # Misc #
 ########
 *.swp
 *~
 .DS_Store
+cscope.*
+tags
 packaging/macosx/COPYING.txt
 packaging/macosx/Info.plist
+packaging/macosx/osx-dmg.sh
+packaging/macosx/Wireshark_package.pmdoc/index.xml
 packaging/rpm/SPECS/wireshark.spec
 packaging/svr4/checkinstall
 packaging/svr4/pkginfo