Merge pull request 'Core: rebase to v0.17.1.7' (#213) from tobtoht/feather:v0.17.1.7 into master

Reviewed-on: feather/feather#213
3 years ago · d1b4db2be4
parent 743c5fa9a4 1e2fa51b98
commit d1b4db2be4
2 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -31,7 +31,7 @@ if(DEBUG)
    set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()
-set(MONERO_HEAD "1fffb4e27a317cdfaf58c7848c143eb7fc3110d9")
+set(MONERO_HEAD "85b0b4f73aa6114e3ff91207aa94ad2a15c939a2")
 set(BUILD_GUI_DEPS ON)
 set(ARCH "x86-64")
 set(BUILD_64 ON)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1fffb4e27a317cdfaf58c7848c143eb7fc3110d9
+Subproject commit 85b0b4f73aa6114e3ff91207aa94ad2a15c939a2
		`@ -1 +1 @@`
			`Subproject commit 1fffb4e27a317cdfaf58c7848c143eb7fc3110d9`				`Subproject commit 85b0b4f73aa6114e3ff91207aa94ad2a15c939a2`