Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr
2012-07-22 23:15:22 +00:00
3 changed files with 8 additions and 6 deletions

View File

@@ -697,7 +697,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
{
int64 nSubsidy = 50 * COIN;
// Subsidy is cut in half every 4 years
// Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years
nSubsidy >>= (nHeight / 210000);
return nSubsidy + nFees;