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,5 +1,6 @@
idf_component_register(SRCS "esp_app_main.c"
idf_component_register(SRC_DIRS .
REQUIRES esp_common pthread squeezelite-ota platform_console telnet
INCLUDE_DIRS .
EMBED_FILES ../server_certs/github.pem
)
)