Merge branch '0.6.0.x' into 0.6.x

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/main.cpp
	src/main.h
This commit is contained in:
Luke Dashjr
2012-08-27 19:20:30 +00:00
6 changed files with 29 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
Bitcoin 0.6.3 BETA
Bitcoin 0.6.4 BETA
Copyright (c) 2009-2012 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying