Merge pull request #403 from sipa/cbitcoinaddress
authorJeff Garzik <jgarzik@exmulti.com>
Sun, 24 Jul 2011 22:38:38 +0000 (15:38 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Sun, 24 Jul 2011 22:38:38 +0000 (15:38 -0700)
keys indexed by address + introduced CBitcoinaddress

1  2 
src/main.cpp
src/wallet.cpp

diff --cc src/main.cpp
Simple merge
diff --cc src/wallet.cpp
Simple merge