diff --git a/.gitignore b/.gitignore index 270a90990..1e9f39e91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,20 @@ CVS .#* -.hg -.hgignore +# Hidden files are ignored by default with exceptions +.* +!/.gitignore +!/.gitmodules +!/.qmake.conf +!/.travis.yml + +# .install files in debian/ are generated and ignored +debian/*.install obj TestResults *.pbxuser *.perspectivev3 -.DS_Store *.old *.log @@ -47,9 +53,6 @@ Makefile* *.ilk #dirs -.moc -.rcc -.obj /bin* /lib* build @@ -67,5 +70,4 @@ Release *qrc_res.cpp #cache -*.pyc *.swp