git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e6c6e3 2f2ac3f)
Merge branch 'bip16_0.4.x' into 0.4.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:30:56 +0000 (13:30 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 21 Mar 2012 17:30:56 +0000 (13:30 -0400)
1  2 
src/main.cpp patch | diff1 | diff2 | blob | history
src/main.h patch | diff1 | diff2 | blob | history

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