git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2eba535 d53fbb4)
Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:10:16 +0000 (10:10 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:10:16 +0000 (10:10 -0400)
Conflicts:
src/main.cpp
src/makefile.unix


Trivial merge
Novacoin client