diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
| commit | 4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe (patch) | |
| tree | 449f4009f16f8897e7bdd37dafea4f4bd6e28e61 /src/main.h | |
| parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
| parent | 566f556c40069ed06c8b734433a2859f4917d242 (diff) | |
| download | bitcoin-4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index fd24818647..fa4db67ac8 100644 --- a/src/main.h +++ b/src/main.h @@ -558,7 +558,7 @@ public: if (nBlockSize == 1) { // Transactions under 10K are free - // (about 4500bc if made of 50bc inputs) + // (about 4500 BTC if made of 50 BTC inputs) if (nBytes < 10000) nMinFee = 0; } |