git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b481373 35a07f8)
Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:10:20 +0000 (20:10 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 8 May 2012 20:10:20 +0000 (20:10 +0000)
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h


Trivial merge
Novacoin client