Merge branch '0.5.x' into 0.6.0.x

Browse Source

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h

...

This commit is contained in:

Luke Dashjr

2012-05-08 20:10:20 +00:00

parent b481373001 35a07f8ec4

commit cd0527453b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available