diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
| commit | 4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe (patch) | |
| tree | 449f4009f16f8897e7bdd37dafea4f4bd6e28e61 /src/script.cpp | |
| parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
| parent | 566f556c40069ed06c8b734433a2859f4917d242 (diff) | |
| download | bitcoin-4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
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 1fc53440d9..a78763e31d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1603,7 +1603,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); } |