git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b53650 507848b)
Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 10 Jan 2012 20:55:40 +0000 (15:55 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 10 Jan 2012 20:55:40 +0000 (15:55 -0500)
Conflicts:
bitcoin-qt.pro
contrib/debian/changelog
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h


Trivial merge
Novacoin client