git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7a2b6e 5ad4028)
Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:52:02 +0000 (13:52 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 27 Apr 2012 17:52:02 +0000 (13:52 -0400)
Conflicts:
doc/build-msw.txt
src/makefile.linux-mingw
src/makefile.mingw


Trivial merge
Novacoin client