git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 354f2dd 7414733)
Merge pull request #352 from TheBlueMatt/newenc
authorJeff Garzik <jgarzik@exmulti.com>
Wed, 13 Jul 2011 02:10:12 +0000 (19:10 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Wed, 13 Jul 2011 02:10:12 +0000 (19:10 -0700)
Wallet Private Key Encryption (on CWallet)

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

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