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

Reviewed-on: https://git.wownero.com/feather/feather/pulls/190
This commit is contained in:
tobtoht 2020-12-07 16:59:31 +00:00
commit b73233df77
2 changed files with 2 additions and 2 deletions

View file

@ -31,7 +31,7 @@ if(DEBUG)
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
endif() endif()
set(MONERO_HEAD "2c41634c13994a8a112a1e3a61e5e0b456791a97") set(MONERO_HEAD "1fffb4e27a317cdfaf58c7848c143eb7fc3110d9")
set(BUILD_GUI_DEPS ON) set(BUILD_GUI_DEPS ON)
set(ARCH "x86-64") set(ARCH "x86-64")
set(BUILD_64 ON) set(BUILD_64 ON)

2
monero

@ -1 +1 @@
Subproject commit 2c41634c13994a8a112a1e3a61e5e0b456791a97 Subproject commit 1fffb4e27a317cdfaf58c7848c143eb7fc3110d9