git.novaco.in Git - novacoin.git/commit - src/util.cpp

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

summary | shortlog | log | commit | commitdiff | tree
(merge: e401e5e d0fe14f)

author	Luke Dashjr <luke-jr+git@utopios.org>
	Sun, 22 Apr 2012 14:05:43 +0000 (10:05 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Sun, 22 Apr 2012 14:05:43 +0000 (10:05 -0400)
commit	a93ab877877925c60b2dbf56bdde8aa46b6b7391
tree	3c473dd4151e38a72763600839a16f4a3b509325	tree \| snapshot
parent	e401e5eb79f944bf772e541baed9ef45f0cb4f43	commit \| diff
parent	d0fe14ffecda4af98ffe7b1523f9a903bf7518a0	commit \| diff

Merge branch '0.4.x' into 0.5.x

Conflicts:
src/main.cpp

12 files changed:

src/base58.h	diff1 \|	diff2 \|	blob \| history
src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/crypter.cpp	diff1 \|	diff2 \|	blob \| history
src/key.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/main.h	diff1 \|	diff2 \|	blob \| history
src/net.cpp	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/protocol.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.h	diff1 \|	diff2 \|	blob \| history

Novacoin client