From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Sat, 5 May 2012 16:13:56 +0000 (+0000)
Subject: Merge branch '0.6.0.x' into 0.6.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=65077e117738357b099634242c65ee10f89f01e1

Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	bitcoin-qt.pro
	contrib/gitian-descriptors/gitian-win32.yml
	doc/README
	doc/README_windows.txt
	share/qt/make_windows_icon.sh
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/net.cpp
	src/net.h
	src/netbase.h
	src/noui.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/optionsmodel.cpp
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/script.cpp
	src/serialize.h
	src/ui_interface.h
	src/uint256.h
---

65077e117738357b099634242c65ee10f89f01e1