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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b1c1c9 b12fc3e)

author	Sunny King <p2pcoin@gmail.com>
	Tue, 20 Dec 2011 19:07:42 +0000 (19:07 +0000)
committer	Sunny King <p2pcoin@gmail.com>
	Tue, 20 Dec 2011 19:12:52 +0000 (19:12 +0000)
commit	de71734ac41eebfe8763ce34e0443d64ea4aacc9
tree	f8c49a0e242fa069f24db1bbd50ab135a77a17b1	tree \| snapshot
parent	9b1c1c96d205849f993eaa23a6c0a3ab947e110d	commit \| diff
parent	b12fc3e11223557855bb2394e1097afbf0de0b79	commit \| diff

Merge bitcoin v0.5.1 into ppcoin

src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/checkpoints.cpp	\|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/main.h	diff1 \|	diff2 \|	blob \| history
src/makefile.unix	diff1 \|	diff2 \|	blob \| history
src/net.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.cpp	diff1 \|	diff2 \|	blob \| history

Novacoin client