]> granicus.if.org Git - esp-idf/commit
Merge branch 'release/v3.1' into feature/cmake_v3.1
authorAngus Gratton <angus@espressif.com>
Thu, 16 Aug 2018 02:58:31 +0000 (12:58 +1000)
committerAngus Gratton <gus@projectgus.com>
Fri, 17 Aug 2018 04:14:10 +0000 (14:14 +1000)
commit7f50bb7e7f9f820bb1b21b2b772d8f2933a342b4
treec19e0370d8b6ff848d8fe17fcd6b4cb293b3a0c1
parent810aa5427cc29b87a3db986cea04f5e3e6e871a9
parent53509c7bfde505b6d0aa5ce0cd1ac48bc3743039
Merge branch 'release/v3.1' into feature/cmake_v3.1
37 files changed:
.gitlab-ci.yml
Kconfig
README.md
components/app_update/esp_ota_ops.c
components/bootloader/subproject/CMakeLists.txt
components/bootloader/subproject/main/esp32.bootloader.ld
components/bt/Kconfig
components/coap/CMakeLists.txt
components/esp32/CMakeLists.txt
components/esp32/ld/esp32.common.ld
components/esp_https_ota/CMakeLists.txt
components/esptool_py/flash_app_args.in
components/esptool_py/flash_partition_table_args.in
components/esptool_py/flash_project_args.in
components/esptool_py/flasher_args.json.in
components/ethernet/emac_main.c
components/expat/CMakeLists.txt
components/freertos/CMakeLists.txt
components/libsodium/CMakeLists.txt
components/partition_table/CMakeLists.txt
components/partition_table/project_include.cmake
components/spiffs/CMakeLists.txt
docs/_static/what-you-need-cmake.png
docs/conf_common.py
docs/en/api-guides/core_dump.rst
docs/en/api-guides/index.rst
docs/en/get-started/eclipse-setup-windows.rst
docs/en/index.rst
docs/zh_CN/api-guides/index.rst
docs/zh_CN/get-started/eclipse-setup-windows.rst
docs/zh_CN/get-started/index.rst
docs/zh_CN/index.rst
examples/mesh/internal_communication/CMakeLists.txt
tools/ci/executable-list.txt
tools/cmake/project.cmake
tools/cmake/run_cmake_lint.sh
tools/idf_monitor.py