From: Angus Gratton Date: Thu, 30 Aug 2018 10:52:31 +0000 (+0800) Subject: Merge branch 'master' into feature/cmake X-Git-Tag: v3.2-beta1~205^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fbfd20f10c10ff1fe23a9ff0dcb3f3705a3c0ba;p=esp-idf Merge branch 'master' into feature/cmake --- 5fbfd20f10c10ff1fe23a9ff0dcb3f3705a3c0ba diff --cc tools/ci/executable-list.txt index a6c44996c7,79fcb31dc2..3579a6e9dc --- a/tools/ci/executable-list.txt +++ b/tools/ci/executable-list.txt @@@ -37,25 -31,13 +37,27 @@@ tools/idf.p tools/idf_monitor.py tools/idf_size.py tools/kconfig/check.sh +tools/kconfig/conf tools/kconfig/lxdialog/check-lxdialog.sh +tools/kconfig/mconf tools/kconfig/merge_config.sh tools/kconfig/streamline_config.pl -tools/kconfig/conf -tools/kconfig/mconf -tools/windows/eclipse_make.sh -tools/test_idf_monitor/run_test_idf_monitor.py +tools/kconfig_new/confgen.py +tools/kconfig_new/confserver.py +tools/kconfig_new/test/test_confserver.py tools/mass_mfg/mfg_gen.py +tools/test_idf_monitor/run_test_idf_monitor.py tools/unit-test-app/unit_test.py +tools/windows/eclipse_make.sh +tools/ci/build_examples_cmake.sh +tools/ci/test_build_system_cmake.sh +tools/ci/check_examples_cmake_make.sh +tools/cmake/convert_to_cmake.py +tools/cmake/run_cmake_lint.sh +tools/idf.py +tools/kconfig_new/confgen.py +tools/kconfig_new/confserver.py +tools/kconfig_new/test/test_confserver.py +tools/windows/tool_setup/build_installer.sh + tools/test_idf_size/test.sh ++