]> 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>
Sun, 5 Feb 2017 07:34:36 +0000 (15:34 +0800)
committerLiu Zhi Fu <liuzhifu@espressif.com>
Sun, 5 Feb 2017 07:34:36 +0000 (15:34 +0800)

Trivial merge