diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2026-02-23 20:59:11 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2026-02-23 20:59:11 -0500 |
| commit | b74815e8b3fd69351fac044b767367da0b5f2914 (patch) | |
| tree | 68bdb3e31a7e2f6628b44bcf002bcbdf37a94a78 | |
| parent | e5606fcf732cea0803cfb48d1164d1c2294353b9 (diff) | |
| parent | 8d68c12120a405f5592c79a0b84b51d01a917b9e (diff) | |
| download | monzero-gui-b74815e8b3fd69351fac044b767367da0b5f2914.tar.gz monzero-gui-b74815e8b3fd69351fac044b767367da0b5f2914.tar.xz monzero-gui-b74815e8b3fd69351fac044b767367da0b5f2914.zip | |
Merge pull request #4568
8d68c12 build: prepare v0.18.4.6 (selsta)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| m--------- | monero | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0676178d..a79d8466 100644 --- 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 "4") -set(VERSION_REVISION "5") +set(VERSION_REVISION "6") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") diff --git a/Dockerfile.windows b/Dockerfile.windows index df9719a1..98663895 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -12,9 +12,9 @@ RUN apt update && \ RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \ update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix) -RUN git clone -b v0.18.4.5 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.4.6 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard 316a98b11ea29b65e61a42cfdc37f762736fd7c1 && \ + git reset --hard dbcc7d212c094bd1a45f7291dbb99a4b4627a96d && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero @@ -105,7 +105,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.4.5`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.6`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui @@ -128,7 +128,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.4.5`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.6`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero -Subproject 316a98b11ea29b65e61a42cfdc37f762736fd7c +Subproject dbcc7d212c094bd1a45f7291dbb99a4b4627a96 |