Merge pull request #773 from gavinandresen/p2shSigOpCount
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 25 Jan 2012 13:21:20 +0000 (05:21 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 25 Jan 2012 13:21:20 +0000 (05:21 -0800)
commitb6a35d2d5235585b728c4373d6c0e69e563caec6
treea410ffb729166366824922db8b030488177b37f2
parent341519523f2144349a920efee32ebf0dab74e7ac
parent137d0685a45d4a02f5773652130704ad135e63f7
Merge pull request #773 from gavinandresen/p2shSigOpCount

Simplify counting of P2SH sigops to match BIP 16
src/main.cpp
src/main.h