diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:22 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-07-22 23:15:22 +0000 |
commit | 4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba (patch) | |
tree | 8dcdd1d39d4ebfd269762fd2e5effb1955672f0c /src/main.cpp | |
parent | b2848bf08a4b6daa67f7fd197aee9f39a08f9b5f (diff) | |
parent | ec9a3c04edc5180e20cb25ecd16558f449fa52e0 (diff) | |
download | bitcoin-4f620dd0f0d0cd9ae1e2bb0403e07bd303e5b3ba.tar.xz |
Merge branch '0.4.x' into 0.5.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 c705f03125..e1acf59d40 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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; |