diff --git a/CMakeLists.txt b/CMakeLists.txt index ea643c09..654604fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(monero-gui) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") set(VERSION_MAJOR "18") -set(VERSION_MINOR "1") -set(VERSION_REVISION "2") +set(VERSION_MINOR "2") +set(VERSION_REVISION "0") 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 b27352e0..0401bab5 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.1.0 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.2.0 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard 727bc5b6878170332bf2d838f2c60d1c8dc685c8 && \ + git reset --hard 99be9a044f3854f339548e2d99c539c18d7b1b01 && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero diff --git a/README.md b/README.md index 07d9b175..b5142546 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,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.1.2`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.2.0`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui @@ -131,7 +131,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.1.2`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.2.0`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/monero b/monero index 66184f30..99be9a04 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 66184f30859796f3c7c22f9497e41b15b5a4a7c9 +Subproject commit 99be9a044f3854f339548e2d99c539c18d7b1b01