Merge pull request #3180

954c9725 repo: prepare v0.17.1.1 (selsta)
This commit is contained in:
Alexander Blair 2020-10-19 00:14:37 -07:00
commit 33afd0bb83
No known key found for this signature in database
GPG Key ID: C64552D877C32479
3 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
set(VERSION_MAJOR "17") set(VERSION_MAJOR "17")
set(VERSION_MINOR "1") set(VERSION_MINOR "1")
set(VERSION_REVISION "0") set(VERSION_REVISION "1")
set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
option(STATIC "Link libraries statically, requires static Qt") option(STATIC "Link libraries statically, requires static Qt")

View File

@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
fi fi
git submodule update --remote git submodule update --remote
git -C $MONERO_DIR fetch git -C $MONERO_DIR fetch
git -C $MONERO_DIR checkout v0.17.1.0 git -C $MONERO_DIR checkout v0.17.1.1
# get monero core tag # get monero core tag
pushd $MONERO_DIR pushd $MONERO_DIR

2
monero

@ -1 +1 @@
Subproject commit 4d855fcca7db286484c256d85619c051a55592ad Subproject commit 76cc82c29234fc2805f936f0fc53d48acc9cedf7