]> granicus.if.org Git - esp-idf/commitdiff
projects / esp-idf / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12e78e9 3af7872)
Merge branch 'master' into feature/openssl
authorDong Heng <dongheng@espressif.com>
Wed, 2 Nov 2016 07:46:52 +0000 (15:46 +0800)
committerDong Heng <dongheng@espressif.com>
Wed, 2 Nov 2016 07:46:52 +0000 (15:46 +0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.