Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-08-12 17:33:03 +00:00
5 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -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);
}