diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-10-26 17:53:52 +0200 |
| commit | 33e7d4b35c0e6159934e6cde62bd5c86973791e5 (patch) | |
| tree | 687f1d48cd6e6dcba3b6c3445b5ddabecdf89a6f /src/cryptonote_core/cryptonote_basic.h | |
| parent | Merge pull request #437 (diff) | |
| parent | hardfork: switch voting to block minor version (diff) | |
| download | monero-33e7d4b35c0e6159934e6cde62bd5c86973791e5.tar.xz | |
Merge pull request #438
6376627 hardfork: switch voting to block minor version (moneromooo-monero)
55178ae unit_tests: remove leftover debug traces in hardfork test (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/cryptonote_basic.h')
| -rw-r--r-- | src/cryptonote_core/cryptonote_basic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index d3db50068..94887b5a0 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -277,8 +277,8 @@ namespace cryptonote /************************************************************************/ struct block_header { - uint8_t major_version; // now used as a voting mechanism, rather than how this particular block is built - uint8_t minor_version; + uint8_t major_version; + uint8_t minor_version; // now used as a voting mechanism, rather than how this particular block is built uint64_t timestamp; crypto::hash prev_id; uint32_t nonce; |