Merge pull request 'Rebase to Monero Core v0.17.1.0' (#58) from tobtoht/feather:v_17_1_0 into master

Reviewed-on: feather/feather#58
4 years ago · ffa8c3e5bf
parent 36641d73a6 5a8641660c
commit ffa8c3e5bf
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -28,7 +28,7 @@ if(DEBUG)
    set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()

-set(MONERO_HEAD "a1404e92cb439ba0f120e7c4a579ed0b9a0372a4")
+set(MONERO_HEAD "fe3c05952281773684e20a964110a9aeb7a4fc74")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a1404e92cb439ba0f120e7c4a579ed0b9a0372a4
+Subproject commit fe3c05952281773684e20a964110a9aeb7a4fc74