git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d8bc0e 6e1e62a)
Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 10 Jan 2012 20:54:25 +0000 (15:54 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 10 Jan 2012 20:54:25 +0000 (15:54 -0500)
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h


Trivial merge
Novacoin client