diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:38 +0000 |
| commit | ff4be740b56a733beb5c7978b56c6602fae51a2e (patch) | |
| tree | 2ad1b7b202c6c44c17f499b8cf8c4aa174e62d60 /src/main.cpp | |
| parent | 222ac2b12ab42d7a0ea66cd6fe4e25efa3c31333 (diff) | |
| parent | 4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (diff) | |
| download | bitcoin-ff4be740b56a733beb5c7978b56c6602fae51a2e.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1951094584..3c19856e34 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -804,7 +804,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; |