diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
| commit | 797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c (patch) | |
| tree | e020813e04c0d63487147f9b586b34367bed9252 /src/script.cpp | |
| parent | 5951d9fe3224b11ba9ae45df4fe44804ec0efd83 (diff) | |
| parent | 9e98fe6f584d8bdd0ffe4d5dc5c0b908beb456db (diff) | |
| download | bitcoin-797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/net.cpp
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 bbb32f68c7..d9101fbdeb 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -904,7 +904,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int } else if ((nHashType & 0x1f) == SIGHASH_SINGLE) { - // Only lockin the txout payee at same index as txin + // Only lock-in the txout payee at same index as txin unsigned int nOut = nIn; if (nOut >= txTmp.vout.size()) { |