Merge pull request #3180

954c972 repo: prepare v0.17.1.1 (selsta)
monero-project · Oct 19, 2020 · 33afd0b · 33afd0b
2 parents a165a14 + 954c972
commit 33afd0b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "17")
 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")

diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
 fi
 git submodule update --remote
 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
 pushd $MONERO_DIR

diff --git a/monero b/monero
+5 −5		README.md
+2 −2		contrib/gitian/README.md
+5 −1		src/blockchain_utilities/blockchain_export.cpp
+7 −5		src/blockchain_utilities/blockchain_import.cpp
+52 −23		src/blockchain_utilities/bootstrap_file.cpp
+5 −5		src/blockchain_utilities/bootstrap_file.h
+ −		src/blocks/checkpoints.dat
+1 −0		src/checkpoints/checkpoints.cpp
+1 −1		src/cryptonote_config.h
+16 −4		src/cryptonote_core/blockchain.cpp
+1 −1		src/version.cpp.in
+5 −0		src/wallet/api/wallet.cpp
+1 −0		src/wallet/api/wallet.h
+5 −0		src/wallet/api/wallet2_api.h
+6 −2		src/wallet/wallet2.cpp