]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71c90ac 7ecdb1b)
Merge branch 'feature/example_defconfig_ci' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Fri, 21 Dec 2018 04:14:57 +0000 (12:14 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Fri, 21 Dec 2018 04:14:57 +0000 (12:14 +0800)
ci, examples: use sdkconfig.ci as an extra defaults file, if present

See merge request idf/esp-idf!3934

1  2 
tools/ci/build_examples.sh patch | diff1 | diff2 | blob | history
tools/cmake/kconfig.cmake patch | diff1 | diff2 | blob | history

diff --cc tools/ci/build_examples.sh
Simple merge
diff --cc tools/cmake/kconfig.cmake
Simple merge
Unnamed repository; edit this file 'description' to name the repository.