]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into bugfix/example_warning_cleanup
authorAngus Gratton <angus@espressif.com>
Wed, 16 Nov 2016 21:59:44 +0000 (08:59 +1100)
committerAngus Gratton <angus@espressif.com>
Wed, 16 Nov 2016 21:59:44 +0000 (08:59 +1100)

Trivial merge