diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-12-02 00:12:36 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-12-02 00:12:36 -0600 |
| commit | 901b4b0f77e9b187a55e7aebfcb08668f2ae6b68 (patch) | |
| tree | 2d4a9efe62ca53a0ea94e605bf66bbd45550e002 | |
| parent | 69dc0b3570f38646de35cb7ec14f6f6dd65bf516 (diff) | |
| parent | fa35410851cdd8daaf9026de4fb21b22bd7ed92a (diff) | |
| download | monzero-gui-901b4b0f77e9b187a55e7aebfcb08668f2ae6b68.tar.gz monzero-gui-901b4b0f77e9b187a55e7aebfcb08668f2ae6b68.tar.xz monzero-gui-901b4b0f77e9b187a55e7aebfcb08668f2ae6b68.zip | |
Merge pull request #3765
fa35410 build: prepare v0.17.3.0 (selsta)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Dockerfile.windows | 4 | ||||
| m--------- | monero | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b2aa54b..5f8b2da9 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 "17") -set(VERSION_MINOR "2") -set(VERSION_REVISION "3") +set(VERSION_MINOR "3") +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 506a2d78..824dc997 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.17.0.0 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.17.3.0 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard d27d4526fe89b7cdeb4b296280c4a6cf7efe21f8 && \ + git reset --hard ab18fea3500841fc312630d49ed6840b3aedb34d && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero diff --git a/monero b/monero -Subproject 2222bea92fdeef7e6449d2d784cdfc3012641ee +Subproject ab18fea3500841fc312630d49ed6840b3aedb34 |