From: Angus Gratton <angus@espressif.com>
Date: Tue, 5 Jun 2018 03:51:19 +0000 (+0800)
Subject: Merge branch 'feature/cmake_update' into 'feature/cmake'
X-Git-Tag: v3.1-rc2~9^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c5f1c866baebd8bf29169cb62509a072768489e;p=esp-idf

Merge branch 'feature/cmake_update' into 'feature/cmake'

cmake: Update cmake branch from master

See merge request idf/esp-idf!2478
---

8c5f1c866baebd8bf29169cb62509a072768489e