Merge c04485850e into merged_master (Bitcoin PR #19536)

This commit is contained in:
Andrew Poelstra 2020-11-26 13:40:57 +00:00
commit 1184c9af4b

View file

@ -80,7 +80,6 @@ $(package)_config_opts += -no-feature-colordialog
$(package)_config_opts += -no-feature-commandlineparser
$(package)_config_opts += -no-feature-concurrent
$(package)_config_opts += -no-feature-dial
$(package)_config_opts += -no-feature-filesystemwatcher
$(package)_config_opts += -no-feature-fontcombobox
$(package)_config_opts += -no-feature-ftp
$(package)_config_opts += -no-feature-http