Merge pull request #864 from sipa/fix_856
authorPieter Wuille <pieter.wuille@gmail.com>
Mon, 20 Feb 2012 02:21:19 +0000 (18:21 -0800)
committerPieter Wuille <pieter.wuille@gmail.com>
Mon, 20 Feb 2012 02:21:19 +0000 (18:21 -0800)
Make compressed pubkeys require client >=0.5.99

1  2 
src/key.h
src/wallet.cpp

diff --cc src/key.h
Simple merge
diff --cc src/wallet.cpp
Simple merge