]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/cmake' into 'master'
authorAngus Gratton <angus@espressif.com>
Fri, 7 Sep 2018 05:44:17 +0000 (13:44 +0800)
committerAngus Gratton <angus@espressif.com>
Fri, 7 Sep 2018 05:44:17 +0000 (13:44 +0800)
Merge experimental CMake support to master

See merge request idf/esp-idf!3024

1  2 
components/bt/Kconfig
components/ethernet/emac_main.c

Simple merge
Simple merge