]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature...
authorTian Hao <tianhao@espressif.com>
Wed, 30 Nov 2016 11:08:40 +0000 (19:08 +0800)
committerTian Hao <tianhao@espressif.com>
Wed, 30 Nov 2016 11:08:40 +0000 (19:08 +0800)

Trivial merge