Merge branch '0.4.x' into 0.5.x

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7fc31bb..95152ce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,14 @@ src/test_bitcoin
 *.o
 *.patch
 .bitcoin
+#compilation and Qt preprocessor part
+*.qm
+Makefile
+bitcoin-qt
+#resources cpp
+qrc_*.cpp
+#qt creator
+*.pro.user
+#mac specific
+.DS_Store
+build