From: Wladimir J. van der Laan <laanwj@gmail.com>
Date: Wed, 7 Sep 2011 16:57:11 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/bitcoin/bitcoin
X-Git-Tag: v0.4.0-unstable~226^2~57^2~33
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99

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

Conflicts:
	.gitignore
---

a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99
diff --cc .gitignore
index 537064d,c1d06a3..29c781c
--- a/.gitignore
+++ b/.gitignore
@@@ -3,12 -3,9 +3,18 @@@ src/bitcoi
  src/bitcoind
  .*.swp
  *.*~*
+ *.bak
+ *.rej
+ *.orig
+ *.o
+ *.patch
+ .bitcoin
 +#compilation and Qt preprocessor part
 +*.o
 +ui_*.h
 +*.qm
 +moc_*
 +Makefile
 +bitcoin-qt
 +#resources cpp
- qrc_*.cpp
++qrc_*.cpp