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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 07ffa47 c7eb151)

author	Sunny King <p2pcoin@gmail.com>
	Sat, 17 Dec 2011 16:07:07 +0000 (16:07 +0000)
committer	Sunny King <p2pcoin@gmail.com>
	Sat, 17 Dec 2011 16:07:07 +0000 (16:07 +0000)
commit	9b1c1c96d205849f993eaa23a6c0a3ab947e110d
tree	c42420620ae97514d176197a49148ae767b186a8	tree \| snapshot
parent	07ffa4726a8059943f4f1d6f4d5a0fed3e759819	commit \| diff
parent	c7eb151ad0ed441d6fd598551059a9bbfb09e99e	commit \| diff

Merge bitcoin v0.4.0 into ppcoin

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/rpc.cpp	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.cpp	diff1 \|	diff2 \|	blob \| history

Novacoin client