Merge branch '0.4.x' into 0.5.0.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-01-10 15:54:25 -05:00

parent 2d8bc0e6da 6e1e62a04c

commit cc19ba76e4

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

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

Diff Content Not Available