Merge branch '0.4.x' into 0.5.x

Browse Source

Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h

...

This commit is contained in:

Luke Dashjr

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

parent b803009c84 18b4eccddb

commit fac3476993

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