git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 700e5a4 5da2dce)
Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:58 +0000 (05:35 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 6 May 2012 05:35:58 +0000 (05:35 +0000)
1  2 
src/db.cpp patch | diff1 | diff2 | blob | history
src/main.cpp patch | diff1 | diff2 | blob | history

diff --cc src/db.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
Novacoin client