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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: b90b815 5e322a7)

author	Gavin Andresen <gavinandresen@gmail.com>
	Tue, 19 Jun 2012 20:34:10 +0000 (16:34 -0400)
committer	Gavin Andresen <gavinandresen@gmail.com>
	Tue, 19 Jun 2012 20:34:10 +0000 (16:34 -0400)
commit	23e7583a8c9a0dcee9cbbf3be8bfc453298773f0
tree	08a6b8dde07dfd356497975d89c3dac3922d3cd7	tree \| snapshot
parent	b90b8159db929232b7142baa903ddc0226dd7e10	commit \| diff
parent	5e322a72f94e3c759bb37cec37d8c066766b6072	commit \| diff

Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3

15 files changed:

bitcoin-qt.pro	diff1 \|	diff2 \|	blob \| history
src/checkpoints.cpp	diff1 \|	diff2 \|	blob \| history
src/db.cpp	diff1 \|	diff2 \|	blob \| history
src/db.h	diff1 \|	diff2 \|	blob \| history
src/key.cpp	diff1 \|	diff2 \|	blob \| history
src/key.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/makefile.linux-mingw	diff1 \|	diff2 \|	blob \| history
src/makefile.mingw	diff1 \|	diff2 \|	blob \| history
src/makefile.osx	diff1 \|	diff2 \|	blob \| history
src/makefile.unix	diff1 \|	diff2 \|	blob \| history
src/script.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/util.h	diff1 \|	diff2 \|	blob \| history
src/version.h	diff1 \|	diff2 \|	blob \| history

Novacoin client