Merge branch '0.4.x' into 0.5.x

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index aeeef17..6ed527d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,20 @@ src/bitcoin
 src/bitcoind
 .*.swp
 *.*~*
+*.bak
+*.rej
+*.orig
+*.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