aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2022-08-10 12:21:43 -0500
committerluigi1111 <luigi1111w@gmail.com>2022-08-10 12:21:43 -0500
commit58ddd8c2bc5970477aa920262d6a15fed12632d6 (patch)
tree4fb12faa01d6251bfc9edf5215937ecfb7321cd4
parent264d3694c56c2462a0f76fdc18527e212719bf7a (diff)
parent91959d3e2efee88717fc9f453cf1c81f3b97487e (diff)
downloadmonzero-gui-58ddd8c2bc5970477aa920262d6a15fed12632d6.tar.gz
monzero-gui-58ddd8c2bc5970477aa920262d6a15fed12632d6.tar.xz
monzero-gui-58ddd8c2bc5970477aa920262d6a15fed12632d6.zip
Merge pull request #3998
91959d3 build: prepare v0.18.1.0 (selsta)
-rw-r--r--CMakeLists.txt2
-rw-r--r--Dockerfile.windows2
-rw-r--r--README.md4
m---------monero0
4 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 376f6f9b..41246545 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(monero-gui)
message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
set(VERSION_MAJOR "18")
-set(VERSION_MINOR "0")
+set(VERSION_MINOR "1")
set(VERSION_REVISION "0")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
diff --git a/Dockerfile.windows b/Dockerfile.windows
index a1dfd824..5b9cf253 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -12,7 +12,7 @@ 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.0.0 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.1.0 --depth 1 https://github.com/monero-project/monero && \
cd monero && \
git reset --hard b6a029f222abada36c7bc6c65899a4ac969d7dee && \
cp -a contrib/depends / && \
diff --git a/README.md b/README.md
index d61a48cd..4744e6f7 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.0.0`) to build the release binaries.
+ \* `master` - replace with the desired version tag (e.g. `v0.18.1.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.0.0`) to build the release binaries.
+ \* `master` - replace with the desired version tag (e.g. `v0.18.1.0`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
diff --git a/monero b/monero
-Subproject b6a029f222abada36c7bc6c65899a4ac969d7de
+Subproject 727bc5b6878170332bf2d838f2c60d1c8dc685c