Merge branch '0.4.x' into 0.5.x

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d6ff91a..95152ce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,23 @@
-*~
+src/*.exe
+src/bitcoin
+src/bitcoind
+src/test_bitcoin
+.*.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