diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-22 20:26:56 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-22 20:38:47 +0000 |
commit | 35e508eead8a738344b3c1ecda854b16b1d4b2d6 (patch) | |
tree | 5d16afceb194c5357e0e21715bfae78ff1b85983 /.gitignore | |
parent | f2cd6dcfee3bd7df5003183e38abf93d7bc91523 (diff) | |
download | wireshark-35e508eead8a738344b3c1ecda854b16b1d4b2d6.tar.gz |
Add Windows CMake auto generated files to .gitignore
This is useful in case of in tree build.
Change-Id: I91a4503221ad097fd15e32677190b36c2d483c1f
Reviewed-on: https://code.wireshark.org/review/12045
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 9e1128bfb6ca2cc75563813304e4feb9780f14f7)
Reviewed-on: https://code.wireshark.org/review/12048
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index a945f2ea18..a477192500 100644 --- a/.gitignore +++ b/.gitignore @@ -138,8 +138,12 @@ 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 @@ -164,6 +168,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 @@ -186,6 +191,7 @@ wsutil/abi-descriptor.xml # Windows Stuff # ################# *.bsc +*.dir/ *.dsp *.dsw *.chm @@ -199,12 +205,25 @@ 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 # ######## |