]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into feature/newlib_locking
authorAngus Gratton <angus@espressif.com>
Thu, 25 Aug 2016 03:25:05 +0000 (11:25 +0800)
committerAngus Gratton <angus@espressif.com>
Thu, 25 Aug 2016 03:25:05 +0000 (11:25 +0800)

Trivial merge