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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 8f0c0c1 6ec9d30)

author	Luke Dashjr <luke-jr+git@utopios.org>
	Thu, 14 Jun 2012 18:21:07 +0000 (18:21 +0000)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Thu, 14 Jun 2012 18:21:07 +0000 (18:21 +0000)
commit	5e322a72f94e3c759bb37cec37d8c066766b6072
tree	1f90145c9e1964685a62a3011b6811fe5e896ede	tree \| snapshot
parent	8f0c0c16d384510b07aec3ca2dde2391429f1b0b	commit \| diff
parent	6ec9d30905e8df77e60d0195074920271abb977a	commit \| diff

Merge branch '0.6.0.x' into 0.6.x

Conflicts:
.gitignore
src/bitcoinrpc.cpp
src/main.cpp
src/qt/bitcoingui.cpp
src/ui_interface.h
src/util.cpp

.gitignore	diff1 \|	diff2 \|	blob \| history
doc/release-process.txt	diff1 \|	diff2 \|	blob \| history
src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/init.h	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/net.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/addressbookpage.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoin.cpp	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoingui.cpp	diff1 \|	diff2 \|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history

Novacoin client