]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf
authorLiu Zhi Fu <liuzhifu@espressif.com>
Mon, 13 Feb 2017 09:39:53 +0000 (17:39 +0800)
committerLiu Zhi Fu <liuzhifu@espressif.com>
Mon, 13 Feb 2017 09:39:53 +0000 (17:39 +0800)

Trivial merge