]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf
authorYulong <huangyulong@espressif.com>
Tue, 25 Apr 2017 11:58:24 +0000 (07:58 -0400)
committerYulong <huangyulong@espressif.com>
Tue, 25 Apr 2017 11:58:24 +0000 (07:58 -0400)

Trivial merge