From: Luke Dashjr Date: Fri, 27 Apr 2012 14:57:15 +0000 (-0400) Subject: Merge branch '0.5.x' into 0.6.0.x X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~7 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=8ba4282c3fd6dd26aa4956e5bc4a38c603625870 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 --- 8ba4282c3fd6dd26aa4956e5bc4a38c603625870