diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-22 11:26:09 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-22 11:37:11 +0100 |
| commit | 595f93977c5636add1f4f2e64cd2d9b19c65a578 (patch) | |
| tree | 84721f9240186bb35b6ec960b87efc9cd368b3f8 /src/script/script.cpp | |
| parent | ed095f0407bdf2abc66a27aa347f489186919e17 (diff) | |
| parent | 37d271d7cce44885f835292ffe99b54399b014d6 (diff) | |
| download | bitcoin-595f93977c5636add1f4f2e64cd2d9b19c65a578.tar.xz | |
Merge pull request #7213
37d271d Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY. (mb300sd)
Diffstat (limited to 'src/script/script.cpp')
| -rw-r--r-- | src/script/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.cpp b/src/script/script.cpp index 9c77ed9fc1..a7ba57e65b 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -131,7 +131,7 @@ const char* GetOpName(opcodetype opcode) // expanson case OP_NOP1 : return "OP_NOP1"; - case OP_NOP2 : return "OP_NOP2"; + case OP_CHECKLOCKTIMEVERIFY : return "OP_CHECKLOCKTIMEVERIFY"; case OP_NOP3 : return "OP_NOP3"; case OP_NOP4 : return "OP_NOP4"; case OP_NOP5 : return "OP_NOP5"; |