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

Conflicts: .gitignore
2011-09-07 18:57:11 +02:00
parent f077d1ad62 f92f022eda
commit a0d2f9a12d
10 changed files with 1150 additions and 38 deletions
--- 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
+qrc_*.cpp