git.novaco.in Git - novacoin.git/commit

git://git.novaco.in / novacoin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1bdfa94 e73b792)

author	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:15:48 +0000 (21:15 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Mon, 16 Apr 2012 01:15:48 +0000 (21:15 -0400)
commit	3374c3ef094b328e6c6957fdaf5a9abff0c53a33
tree	2c31367efc456d8a77d235be53612190e184b554	tree \| snapshot
parent	1bdfa94a0164f73b453633861b91c67bb6bf10d8	commit \| diff
parent	e73b792b1af9d9d747bac81a27d16020ed393905	commit \| diff

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.h
src/util.cpp

doc/assets-attribution.txt	diff1 \|	diff2 \|	blob \| history
src/bignum.h	diff1 \|	diff2 \|	blob \| history
src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/keystore.h	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoin.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoingui.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/sendcoinsdialog.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/walletmodel.h	diff1 \|	diff2 \|	blob \| history
src/uint256.h	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history

Novacoin client