diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:33:03 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:33:03 +0000 |
| commit | 8ddc257a4b422aee2a0e58362f31fbd32301f12f (patch) | |
| tree | fb959be4432cd9d8eea9402de79890a7131e39f0 /src/script.cpp | |
| parent | 982f4fd301435e56bb959267a8f69ff793b10e26 (diff) | |
| parent | 448f6b3d9b6d598f6a3db7807934d10fe94d5a71 (diff) | |
| download | bitcoin-8ddc257a4b422aee2a0e58362f31fbd32301f12f.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.cpp b/src/script.cpp index d9101fbdeb..3b9d6c8db5 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1269,7 +1269,7 @@ int CScript::GetSigOpCount(const CScript& scriptSig) const return 0; } - /// ... and return it's opcount: + /// ... and return its opcount: CScript subscript(data.begin(), data.end()); return subscript.GetSigOpCount(true); } |