]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into driver_merge_tmp/merge_gpio
authorWangjialin <wangjialin@espressif.com>
Thu, 22 Sep 2016 02:50:06 +0000 (10:50 +0800)
committerWangjialin <wangjialin@espressif.com>
Thu, 22 Sep 2016 02:50:06 +0000 (10:50 +0800)

Trivial merge