git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b803009 18b4ecc)
Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:08:19 +0000 (20:08 +0000)
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h


Trivial merge
Novacoin client