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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a76546 eb72eae)

author	Wladimir J. van der Laan <laanwj@gmail.com>
	Tue, 16 Aug 2011 08:28:24 +0000 (10:28 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Tue, 16 Aug 2011 08:28:24 +0000 (10:28 +0200)
commit	b90c9ecb132ad686275afafe506f8044719245ec
tree	fc805f0c16b23faff1eb10b46da132e8c1951712	tree \| snapshot
parent	0a76546ae973241259aa5019e0d27758f86ef891	commit \| diff
parent	eb72eae304a7067eb568437c66c4d831b075dab9	commit \| diff

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

src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/bitcoinrpc.h	diff1 \|	diff2 \|	blob \| history
src/headers.h	diff1 \|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/script.cpp	diff1 \|	diff2 \|	blob \| history
src/serialize.h	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/util.h	diff1 \|	diff2 \|	blob \| history
src/wallet.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.h	diff1 \|	diff2 \|	blob \| history

Novacoin client