Files
bitcoin/contrib
Luke Dashjr 65077e1177 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
2012-05-05 16:13:56 +00:00
..
2011-10-03 14:04:11 -07:00