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