Merge branch 'beatrice' into develop

This commit is contained in:
serkixenos 2022-05-11 22:27:00 +02:00
commit 852565dcb1
2 changed files with 4 additions and 4 deletions

View file

@ -66,7 +66,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1
# make -j8 for 32GB RAM # make -j8 for 32GB RAM
make -j$(nproc) make -j$(nproc)
make install # this can install the executable files under /usr/local sudo make install # this can install the executable files under /usr/local
``` ```
## Ubuntu 18.04 ## Ubuntu 18.04
@ -142,7 +142,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1
# make -j8 for 32GB RAM # make -j8 for 32GB RAM
make -j$(nproc) make -j$(nproc)
make install # this can install the executable files under /usr/local sudo make install # this can install the executable files under /usr/local
``` ```

View file

@ -1,7 +1,7 @@
#ifndef HARDFORK_SON3_TIME #ifndef HARDFORK_SON3_TIME
#ifdef BUILD_PEERPLAYS_TESTNET #ifdef BUILD_PEERPLAYS_TESTNET
#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-04-30T00:00:00")) #define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-05-31T00:00:00"))
#else #else
#define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-04-30T00:00:00")) #define HARDFORK_SON3_TIME (fc::time_point_sec::from_iso_string("2022-05-31T00:00:00"))
#endif #endif
#endif #endif