diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b94e94e..cf0a7e5c 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 "4") +set(VERSION_REVISION "5") 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 0c35dad5..4314b1cb 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.4 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.4.5 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard 516e5355a103a2bf0b7e10328ebcaa2945019445 && \ + git reset --hard 316a98b11ea29b65e61a42cfdc37f762736fd7c1 && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero diff --git a/README.md b/README.md index 2d13f6f6..d49a6e91 100644 --- a/README.md +++ b/README.md @@ -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.4`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.5`) 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.4`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.4.5`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero index 516e5355..316a98b1 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 516e5355a103a2bf0b7e10328ebcaa2945019445 +Subproject commit 316a98b11ea29b65e61a42cfdc37f762736fd7c1