Fix compilation of packet-aruba-erm.c

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

diff --git a/.gitignore b/.gitignore
index 418f27734c76472e6fc3887558d40b2bfb1b6fa9..7bf2a36a428ce3055a2f3984b47b46812081f9e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
+#
+# This file is tracked by git for the wireshark repository, and thus
+# should only contain ignore entries common to all wireshark developers.
+# To ignore files specific to your local repository, for example files
+# generated by your editor, add them to your repository exclude file
+# (.git/info/exclude) or your global ~/.gitignore_global. For details
+# see:
+#   https://help.github.com/articles/ignoring-files
+#
+
 # Compiled or generated source #
 ################################
 *.dll
@@ -9,6 +19,7 @@
 *.pyc
 *.so*
 *.[oa]
+*.dylib
 *grammar.out
 *grammar.[ch]
 *scanner.c
@@ -40,7 +51,7 @@ epan/ps.c
 ui/cli/tshark-tap-register-cache.pkl
 plugin.c
 plugins/mate/mate_parser.c
-svnversion.h
+version.h
 tools/lemon/lemon
 tools/lemon/lemon
 tools/setuid-root.pl
@@ -61,6 +72,7 @@ captype
 compile
 config.h
 config.h.in
+config.cache
 config.log
 config.status
 configure
@@ -69,6 +81,7 @@ dftest
 dumpcap
 editcap
 exntest
+gitversion.h
 install-sh
 libtool
 ltmain.sh
@@ -117,6 +130,20 @@ doxygen.cfg
 help/faq.txt
 pod2htm[di].tmp
 wireshark.pod
+docbook/developer-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/git_version.xml
+docbook/release-notes-*.pdf
+docbook/release-notes.txt
+docbook/wsdg.validated
+docbook/wsluarm
+docbook/wsluarm_src/
+docbook/wsug.validated
+
 
 # Qt #
 ######
@@ -175,6 +202,7 @@ ui/qt/config.pri
 .DS_Store
 cscope.*
 tags
+macosx-support-libs
 packaging/macosx/COPYING.txt
 packaging/macosx/Info.plist
 packaging/macosx/osx-dmg.sh
@@ -182,6 +210,3 @@ packaging/macosx/Wireshark_package.pmdoc/index.xml
 packaging/rpm/SPECS/wireshark.spec
 packaging/svr4/checkinstall
 packaging/svr4/pkginfo
-*.dylib
-*.sublime-project
-*.sublime-workspace