Merge remote-tracking branch 'origin/master' into master-cmake

Conflicts:
	components/raop/raop.c
	components/raop/rtp.c
	main/cmd_squeezelite.c
This commit is contained in:
Sebastien
2020-03-08 09:54:50 -04:00
48 changed files with 951 additions and 481 deletions

View File

@@ -1,8 +1,6 @@
idf_component_register(SRCS platform_bt_core.c
platform_bt_sink.c
platform_bt_source.c
INCLUDE_DIRS .
REQUIRES bt display esp_common freertos nvs_flash esp32 spi_flash newlib log pthread platform_config
idf_component_register( SRC_DIRS .
INCLUDE_DIRS .
REQUIRES bt display esp_common freertos nvs_flash esp32 spi_flash newlib pthread platform_config
)