]> granicus.if.org Git - esp-idf/commitdiff
Merge remote-tracking branch 'refs/remotes/origin/update/mfg_gen' into update/mfg_gen
authorShivani Tipnis <shivani@espressif.com>
Fri, 12 Oct 2018 05:35:02 +0000 (11:05 +0530)
committerShivani Tipnis <shivani@espressif.com>
Fri, 12 Oct 2018 05:35:02 +0000 (11:05 +0530)

Trivial merge