Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.

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

diff --git a/.gitignore b/.gitignore
index c3bc907403c09071edec999119d3b95f04b96e0e..0549c165a25cd53c8b3c0677117aba16d0a0b489 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,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,7 +36,9 @@ epan/wslua/init.lua
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
 epan/wslua/taps_wslua.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
@@ -78,6 +82,7 @@ stamp-h1
 text2pcap
 tshark
 wireshark
+wmem_test
 ylwrap
 
 
@@ -111,16 +116,28 @@ 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
 
 # Misc #
 ########
@@ -130,6 +147,7 @@ qtshark
 cscope.*
 packaging/macosx/COPYING.txt
 packaging/macosx/Info.plist
+packaging/macosx/osx-dmg.sh
 packaging/rpm/SPECS/wireshark.spec
 packaging/svr4/checkinstall
 packaging/svr4/pkginfo