Merge branch 'master' of https://github.com/bitcoin/bitcoin

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 537064d..29c781c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,12 @@ src/bitcoin
 src/bitcoind
 .*.swp
 *.*~*
+*.bak
+*.rej
+*.orig
+*.o
+*.patch
+.bitcoin
 #compilation and Qt preprocessor part
 *.o
 ui_*.h
@@ -11,4 +17,4 @@ moc_*
 Makefile
 bitcoin-qt
 #resources cpp
-qrc_*.cpp
\ No newline at end of file
+qrc_*.cpp