Merge branch '0.4.x' into 0.5.x

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 29c781c..6ed527d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,13 @@ src/bitcoind
 *.patch
 .bitcoin
 #compilation and Qt preprocessor part
-*.o
-ui_*.h
 *.qm
-moc_*
 Makefile
 bitcoin-qt
 #resources cpp
 qrc_*.cpp
+#qt creator
+*.pro.user
+#mac specific
+.DS_Store
+build