diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-26 14:33:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-26 14:42:45 +0200 |
| commit | 41076aad0cbdfa4c4cf376e345114a5c29086f81 (patch) | |
| tree | 7c1e46cb4ebf5b8eefffabeb46d2265bef74b287 /src/main.cpp | |
| parent | 5aa34c79440f318d54e650c7bdf86d4c058b7de0 (diff) | |
| parent | ffd75adce01a78b3461b3ff05bcc2b530a9ce994 (diff) | |
Merge pull request #6124
ffd75ad Enable CHECKLOCKTIMEVERIFY as a standard script verify flag (Peter Todd)
bc60b2b Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) (Peter Todd)
48e9c57 Move LOCKTIME_THRESHOLD to src/script/script.h (Peter Todd)
99088d6 Make CScriptNum() take nMaxNumSize as an argument (Peter Todd)
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions