git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2abd56f ca221e6)
Merge branch 'log-timestamp' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:57 +0000 (17:15 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:57 +0000 (17:15 -0400)
1  2 
util.cpp patch | diff1 | diff2 | blob | history

diff --cc util.cpp
Simple merge
Novacoin client