summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-08 23:51:02 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-08 23:51:02 -0700
commit83eb64a9ef5281a28378af8cb252ec5329b0d142 (patch)
tree43de2f48b5c0c05c1c206f84251eabccffe5a5b2 /.gitignore
parent8e8a631cbc354e47c94913f4e82295cea13b3892 (diff)
parentdddcd1016218a1b9b9662be078665e24d46efbac (diff)
downloadsubsurface-83eb64a9ef5281a28378af8cb252ec5329b0d142.tar.gz
Merge http://github.com/thiagomacieira/subsurface
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 6 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 520248b58..085323a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,19 +3,14 @@
*.rej
*.exe
*.dmg
-*.moc
-*.moc.cpp
*.patch
-*.ui.h
*.xml
version.h
!dives/*.xml
*~
po/*.mo
-qt-ui/ui_*.h
/subsurface
/*.tar.gz
-.dep/
share/
Documentation/docbook-xsl.css
Documentation/user-manual.html
@@ -23,13 +18,11 @@ Documentation/user-manual.pdf
Documentation/user-manual.text
packaging/windows/subsurface.nsi
packaging/macos/Info.plist
-config.cache
-*.qrc.cpp
-ui_*
-/subsurface.config
-/subsurface.creator
-/subsurface.creator.user
-/subsurface.files
-/subsurface.includes
*.kdev4
callgrind.out.*
+.rcc
+.moc
+.uic
+.obj
+Makefile
+subsurface.pro.user*