Skip to content

Commit

Permalink
Merge pull request #4030
Browse files Browse the repository at this point in the history
b1f1080 build: prepare v0.18.1.1 (selsta)
  • Loading branch information
luigi1111 committed Sep 18, 2022
2 parents fa55575 + b1f1080 commit 57fefba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
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 "0")
set(VERSION_REVISION "1")
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
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.0`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.1.1`) 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.0`) to build the release binaries.
\* `master` - replace with the desired version tag (e.g. `v0.18.1.1`) to build the release binaries.
3. Prepare build environment
```
cd monero-gui
Expand Down
2 changes: 1 addition & 1 deletion monero
Submodule monero updated 38 files
+5 −5 README.md
+4 −4 contrib/epee/src/file_io_utils.cpp
+7 −6 contrib/gitian/DOCKRUN.md
+1 −1 contrib/gitian/README.md
+ src/blocks/checkpoints.dat
+1 −0 src/checkpoints/checkpoints.cpp
+5 −0 src/cryptonote_basic/hardfork.h
+1 −1 src/cryptonote_core/blockchain.cpp
+14 −0 src/cryptonote_core/blockchain.h
+4 −0 src/cryptonote_core/cryptonote_core.cpp
+7 −0 src/cryptonote_core/cryptonote_core.h
+6 −6 src/device_trezor/device_trezor.cpp
+2 −2 src/device_trezor/trezor/protocol.hpp
+8 −1 src/multisig/multisig_account.cpp
+9 −0 src/multisig/multisig_account.h
+1 −1 src/multisig/multisig_account_kex_impl.cpp
+10 −0 src/rpc/core_rpc_server.cpp
+20 −1 src/rpc/core_rpc_server_commands_defs.h
+169 −0 src/serialization/tuple.h
+44 −25 src/simplewallet/simplewallet.cpp
+1 −2 src/simplewallet/simplewallet.h
+1 −1 src/version.cpp.in
+10 −4 src/wallet/api/wallet.cpp
+31 −1 src/wallet/node_rpc_proxy.cpp
+3 −1 src/wallet/node_rpc_proxy.h
+229 −51 src/wallet/wallet2.cpp
+82 −18 src/wallet/wallet2.h
+10 −0 src/wallet/wallet_errors.h
+1 −1 src/wallet/wallet_rpc_server.cpp
+4 −0 src/wallet/wallet_rpc_server_commands_defs.h
+ tests/data/fuzz/cold-outputs/out-all-6
+99 −17 tests/functional_tests/cold_signing.py
+5 −3 tests/functional_tests/functional_tests_rpc.py
+1 −1 tests/fuzz/cold-outputs.cpp
+1 −1 tests/unit_tests/multisig.cpp
+1 −1 utils/fish/monero-wallet-cli.fish
+1 −0 utils/fish/monero-wallet-rpc.fish
+4 −1 utils/python-rpc/framework/wallet.py

0 comments on commit 57fefba

Please sign in to comment.