]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'wifi' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into wifi
authorxiaxiaotian <xiaxiaotian@espressif.com>
Tue, 30 Aug 2016 10:10:30 +0000 (18:10 +0800)
committerxiaxiaotian <xiaxiaotian@espressif.com>
Tue, 30 Aug 2016 10:10:30 +0000 (18:10 +0800)
1  2 
components/esp32/include/esp_wifi.h

Simple merge