git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1eafe5 1a4ac2b)
Merge branch '0.5.3.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 22 Mar 2012 18:15:12 +0000 (14:15 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 22 Mar 2012 18:15:12 +0000 (14:15 -0400)
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h


Trivial merge
Novacoin client