From: Luke Dashjr Date: Tue, 10 Jan 2012 20:54:25 +0000 (-0500) Subject: Merge branch '0.4.x' into 0.5.0.x X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~31^2~1 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=cc19ba76e45aad5cfb108e270b11f42be7a7b94e Merge branch '0.4.x' into 0.5.0.x Conflicts: contrib/Bitcoin.app/Contents/Info.plist doc/README doc/README_windows.txt share/setup.nsi src/serialize.h --- cc19ba76e45aad5cfb108e270b11f42be7a7b94e