Sebastien
|
39058213fa
|
Merge remote-tracking branch 'origin/httpd' into master-cmake
Conflicts:
.cproject
.gitmodules
.project
.pydevproject
.settings/language.settings.xml
.settings/org.eclipse.cdt.core.prefs
components/cmd_i2c/CMakeLists.txt
components/cmd_i2c/cmd_i2ctools.c
components/cmd_i2c/component.mk
components/cmd_nvs/cmd_nvs.c
components/cmd_nvs/component.mk
components/cmd_system/cmd_system.c
components/cmd_system/component.mk
components/config/config.c
components/config/config.h
components/config/nvs_utilities.c
components/display/CMakeLists.txt
components/driver_bt/CMakeLists.txt
components/driver_bt/component.mk
components/raop/raop.c
components/services/CMakeLists.txt
components/squeezelite-ota/cmd_ota.c
components/squeezelite-ota/squeezelite-ota.c
components/squeezelite-ota/squeezelite-ota.h
components/squeezelite/component.mk
components/telnet/CMakeLists.txt
components/wifi-manager/CMakeLists.txt
components/wifi-manager/dns_server.c
components/wifi-manager/http_server.c
components/wifi-manager/http_server.h
components/wifi-manager/wifi_manager.c
components/wifi-manager/wifi_manager.h
main/CMakeLists.txt
main/console.c
main/esp_app_main.c
main/platform_esp32.h
|
2020-03-10 13:55:22 -04:00 |
|