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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 722ff53 3703150)

author	Luke Dashjr <luke-jr+git@utopios.org>
	Thu, 14 Jun 2012 18:13:46 +0000 (18:13 +0000)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Thu, 14 Jun 2012 18:13:46 +0000 (18:13 +0000)
commit	6ec9d30905e8df77e60d0195074920271abb977a
tree	59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904	tree \| snapshot
parent	722ff53718333dc290760d528b7a561d29ab41a8	commit \| diff
parent	3703150d56ff6ee557ab330e55637c9c23835902	commit \| diff

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
src/main.h
src/net.cpp
src/serialize.h

14 files changed:

contrib/debian/control	diff1 \|	diff2 \|	blob \| history
doc/build-unix.txt	diff1 \|	diff2 \|	blob \| history
doc/release-process.txt	diff1 \|	diff2 \|	blob \| history
src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/init.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/net.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/addressbookpage.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoin.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoingui.cpp	diff1 \|	diff2 \|	blob \| history
src/qtui.h	diff1 \|	diff2 \|	blob \| history
src/test/test_bitcoin.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history

Novacoin client