diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-09-28 10:09:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-09-28 10:09:28 +0200 |
| commit | 1e7fc9c09314dd63614ab8d919cb57a3573a9549 (patch) | |
| tree | 9f890b7155bab98597511c0d356aae6a624cd2eb /src/daemon/main.cpp | |
| parent | 419d70eb1fb8fae8476086dfdd163e63dff9d367 (diff) | |
| parent | 33affd2d17b8b207ef50331b21e4dad08c97146d (diff) | |
| download | monzero-core-1e7fc9c09314dd63614ab8d919cb57a3573a9549.tar.gz monzero-core-1e7fc9c09314dd63614ab8d919cb57a3573a9549.tar.xz monzero-core-1e7fc9c09314dd63614ab8d919cb57a3573a9549.zip | |
Merge pull request #410
33affd2 blockchain: on hardfork 2, require mixin 2 at least if possible (moneromooo-monero)
434e0f4 hardfork: make the voting window a week (moneromooo-monero)
0a7421b hardfork: rescan speedup (moneromooo-monero)
fec98b8 hardfork: remove use of GNU extension for initializing object (moneromooo-monero)
4bbf944 blockchain: on hardfork 2, allow miners to claim less money than allowed (moneromooo-monero)
088bc56 hardfork: change window semantics to not count the newly added block (moneromooo-monero)
198f557 blockchain: use different hard fork settings for testnet and mainnet (moneromooo-monero)
Diffstat (limited to 'src/daemon/main.cpp')
0 files changed, 0 insertions, 0 deletions