git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27960a3 91aadbd)
Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:44:00 +0000 (16:44 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 16 Mar 2012 20:44:00 +0000 (16:44 -0400)
Conflicts:
contrib/Bitcoin.app/Contents/Info.plist
doc/README
doc/README_windows.txt
share/setup.nsi
src/serialize.h

1  2 
src/key.h patch | diff1 | diff2 | blob | history
src/main.cpp patch | diff1 | diff2 | blob | history

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