highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-09 08:43:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
This commit is contained in:
Luke Dashjr
2012-08-12 17:16:40 +00:00
parent 89c5c381b7 982f4fd301
commit cafa8f2879
26 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script.cpp
View File

@@ -1061,7 +1061,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())
{