changeset 3003:e343e5104afe draft

Merge branch '0.5.x' into 0.6.0.x Conflicts: bitcoin-qt.pro 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:10:20 +0000
parents 78df73f87130 (current diff) f6f733dc0a3b (diff)
children a36e0fbd76b7
files bitcoin-qt.pro 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