changeset 3001:dd1e653f9c88 draft

Merge branch '0.4.x' into 0.5.x Conflicts: contrib/Bitcoin.app/Contents/Info.plist doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
author Luke Dashjr <luke-jr+git@utopios.org>
date Tue, 08 May 2012 20:08:19 +0000
parents f59c34abfbfa (current diff) cedde24171f6 (diff)
children f6f733dc0a3b
files doc/README doc/README_windows.txt share/setup.nsi src/serialize.h
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff