Mercurial > hg > bitcoin
changeset 2844:d308826d3540 draft
Merge branch '0.5.3.x' into 0.5.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 | Thu, 22 Mar 2012 14:15:12 -0400 |
parents | 92b438c3c4e2 (current diff) 33e73fe6ca4f (diff) |
children | 19387f8154a8 |
files | bitcoin-qt.pro doc/README doc/README_windows.txt share/setup.nsi src/serialize.h |
diffstat | 0 files changed, 0 insertions(+), 0 deletions(-) [+] |