Allow "capture info data" to not be a singleton.

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

diff --git a/.gitignore b/.gitignore
index d512d826b222eefe5280bea01525d003a8d091cb..6ceefc482d542fde515fbaa2d6f4c7f29abdb4dc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,8 @@ wiretap/ascend.h
 wiretap/k12text.c
 wireshark-tap-register.c
 wireshark-tap-register-cache.pkl
+ui/gtk/wireshark-gresources.c
+ui/gtk/wireshark-gresources.h
 
 # Generated makefile system #
 #############################
@@ -82,7 +84,6 @@ dumpcap
 editcap
 echld_test
 exntest
-gitversion.h
 install-sh
 libtool
 libtool.m4
@@ -100,6 +101,7 @@ randpkt
 rawshark
 reordercap
 reassemble_test
+sshdump
 stamp-h1
 text2pcap
 tfshark
@@ -114,10 +116,22 @@ ylwrap
 ##################
 CMakeCache.txt
 CMakeFiles
+CMakeLists.txt.user*
 cmake_install.cmake
 CPackConfig.cmake
 CPackSourceConfig.cmake
 lib/
+WiresharkConfig.cmake
+WiresharkConfigVersion.cmake
+epan/_regc.tmp
+wireshark.pc
+run/
+tshark-tap-register-cache.pkl
+build.ninja
+rules.ninja
+.ninja_deps
+.ninja_log
+asn1/*/*-stamp
 
 
 # Generated dir #
@@ -139,15 +153,18 @@ doxygen-*.tag
 help/faq.txt
 pod2htm[di].tmp
 wireshark.pod
-docbook/developer-guide.xml
-docbook/user-guide.xml
+docbook/developer-guide-toc.hhc
+docbook/developer-guide.hhp
+docbook/developer-guide*.xml
+docbook/user-guide-toc.hhc
+docbook/user-guide.hhp
+docbook/user-guide*.xml
 docbook/ws?g_src/WS?G_*.dbk
 docbook/*-guide-*.fo
 docbook/*-guide-*.pdf
 docbook/ws?g_html/
 docbook/ws?g_html_chunked/
 docbook/ws?g_chm/
-docbook/git_version.xml
 docbook/release-notes-*.pdf
 docbook/release-notes.txt
 docbook/wsdg.validated
@@ -166,6 +183,7 @@ qtshark
 /ui/qt/*.pro.user
 #/ui/qt/*.qm
 /ui/qt/moc_*.cpp
+/ui/qt/moc_*.cpp_parameters
 /ui/qt/*.moc.cpp
 /ui/qt/moc_*.cxx
 /ui/qt/qrc_*.cpp
@@ -178,8 +196,6 @@ qtshark
 #######
 epan/abi-check-headers/
 epan/abi-descriptor.xml
-filetap/abi-check-headers/
-filetap/abi-descriptor.xml
 wiretap/abi-check-headers/
 wiretap/abi-descriptor.xml
 wsutil/abi-check-headers/
@@ -188,6 +204,7 @@ wsutil/abi-descriptor.xml
 # Windows Stuff #
 #################
 *.bsc
+*.dir/
 *.dsp
 *.dsw
 *.chm
@@ -201,15 +218,29 @@ wsutil/abi-descriptor.xml
 !adns_dll.rc
 !image/file_dlg_win32.rc
 *.res
+*.vcxproj*
+/Copying.txt
+/News.txt
+/README.txt
+/README.windows.txt
+Win32/
+Wireshark.opensdf
+Wireshark.sdf
+Wireshark.sln
+Wireshark.*.suo
+x64/
 _libs_check_
 /wireshark-gtk*
 doc/ws.css
 ui/qt/config.pri
 packaging/nsis/all-manifest.nsh
 packaging/nsis/gtk-dll-manifest.nsh
+/packaging/portableapps/WiresharkPortable/
+/zlib/
 
 # Misc #
 ########
+.vagrant
 *.swp
 *~
 .DS_Store