Merge pull request 'Syncing hotfix' (#153) from tobtoht/feather:sync_hotfix into master

Reviewed-on: https://git.wownero.com/feather/feather/pulls/153
This commit is contained in:
tobtoht 2020-11-14 14:48:11 +00:00
commit 137ef6da72
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 "2390030d10b69c357165f82aaf417391a9e11019") set(MONERO_HEAD "f1f2bddea9dd111e806a398cb7b49ea3b8d5b990")
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 2390030d10b69c357165f82aaf417391a9e11019 Subproject commit f1f2bddea9dd111e806a398cb7b49ea3b8d5b990