Skip to content

Commit

Permalink
Merge pull request #4042
Browse files Browse the repository at this point in the history
df9b35e build: prepare v0.18.1.2 (selsta)
  • Loading branch information
luigi1111 committed Sep 28, 2022
2 parents f93c677 + df9b35e commit aef4a98
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")

set(VERSION_MAJOR "18")
set(VERSION_MINOR "1")
set(VERSION_REVISION "1")
set(VERSION_REVISION "2")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

option(STATIC "Link libraries statically, requires static Qt")
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.1.2`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
Expand All @@ -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.1`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.1.2`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
Expand Down
2 changes: 1 addition & 1 deletion monero
Submodule monero updated 45 files
+1 −1 .github/workflows/build.yml
+2 −2 .github/workflows/depends.yml
+9 −10 README.md
+0 −1 contrib/brew/Brewfile
+1 −2 contrib/depends/Makefile
+0 −15 contrib/depends/config.site.in
+0 −34 contrib/depends/packages/ldns.mk
+1 −2 contrib/depends/packages/packages.mk
+0 −175 contrib/depends/packages/qt.mk
+1 −1 contrib/depends/packages/unbound.mk
+0 −19 contrib/depends/patches/qt/fix_no_printer.patch
+0 −11 contrib/depends/patches/qt/fix_qt_pkgconfig.patch
+0 −15 contrib/depends/patches/qt/fix_rcc_determinism.patch
+0 −69 contrib/depends/patches/qt/no-xlib.patch
+0 −2 contrib/depends/toolchain.cmake.in
+1 −1 contrib/gitian/DOCKRUN.md
+1 −1 contrib/gitian/README.md
+ src/blocks/checkpoints.dat
+1 −0 src/checkpoints/checkpoints.cpp
+1 −1 src/common/dns_utils.cpp
+5 −1 src/common/threadpool.h
+3 −3 src/cryptonote_core/blockchain.cpp
+1 −5 src/cryptonote_core/cryptonote_core.cpp
+8 −0 src/cryptonote_protocol/cryptonote_protocol_handler.inl
+9 −3 src/gen_multisig/gen_multisig.cpp
+4 −3 src/multisig/multisig_account.cpp
+10 −2 src/multisig/multisig_account.h
+106 −45 src/multisig/multisig_account_kex_impl.cpp
+3 −3 src/ringct/rctSigs.cpp
+18 −12 src/simplewallet/simplewallet.cpp
+1 −1 src/simplewallet/simplewallet.h
+1 −1 src/version.cpp.in
+5 −5 src/wallet/api/wallet.cpp
+1 −1 src/wallet/api/wallet.h
+2 −1 src/wallet/api/wallet2_api.h
+24 −14 src/wallet/wallet2.cpp
+2 −1 src/wallet/wallet2.h
+1 −1 src/wallet/wallet_rpc_payments.cpp
+1 −8 src/wallet/wallet_rpc_server.cpp
+3 −1 src/wallet/wallet_rpc_server_commands_defs.h
+1 −0 tests/core_proxy/core_proxy.h
+1 −1 tests/core_tests/chaingen.h
+64 −24 tests/unit_tests/multisig.cpp
+1 −0 tests/unit_tests/node_server.cpp
+2 −1 utils/python-rpc/framework/wallet.py

0 comments on commit aef4a98

Please sign in to comment.