Merge pull request #4221

ab8ac87 build: prepare v0.18.3.1 (selsta)
monero-project · Oct 2, 2023 · bea3032 · bea3032
2 parents 588b843 + ab8ac87
commit bea3032
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
 set(VERSION_MINOR "3")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "1")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.3.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -130,7 +130,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.3.0`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.3.1`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

diff --git a/monero b/monero
+5 −5		README.md
+1 −1		contrib/gitian/DOCKRUN.md
+1 −1		contrib/gitian/README.md
+ −		src/blocks/checkpoints.dat
+1 −0		src/checkpoints/checkpoints.cpp
+3 −34		src/cryptonote_core/blockchain.cpp
+1 −1		src/version.cpp.in
+1 −1		src/wallet/wallet2.cpp
+1 −1		src/wallet/wallet2.h
+1 −1		src/wallet/wallet_rpc_server.cpp
+35 −0		tests/unit_tests/long_term_block_weight.cpp