Merge branch 'doc/wifi_channel_state_information' into 'master'

author Jiang Jiang Jian <jack@espressif.com>

Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)

committer Jiang Jiang Jian <jack@espressif.com>

Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)
author Jiang Jiang Jian <jack@espressif.com>
Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)
committer Jiang Jiang Jian <jack@espressif.com>
Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)
diff --cc components/esp32/include/esp_wifi.h

index daaa14f89deca6601ea06284bedef6910970d24c,88f033096839a87857f8798d6bb38ae34a3847d8..88f033096839a87857f8798d6bb38ae34a3847d8

mode 100644,100755..100644
--- 1/components/esp32/include/esp_wifi.h
--- 2/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
diff --cc components/esp32/include/esp_wifi_types.h

index 97757f0b8ad84a93f3ca9a84c2445f8a2a2277ac,a453c427b1ebb010a77728f8cb13ccd9cd10ec07..a453c427b1ebb010a77728f8cb13ccd9cd10ec07

mode 100644,100755..100644
--- 1/components/esp32/include/esp_wifi_types.h
--- 2/components/esp32/include/esp_wifi_types.h
+++ b/components/esp32/include/esp_wifi_types.h
diff --cc docs/en/api-guides/wifi.rst

index aefbb3930216133379ba4a65169c1b58d868a6a3,859cf4f650e0705d0fb3057e3b68f71f1b8a1d70..859cf4f650e0705d0fb3057e3b68f71f1b8a1d70

mode 100644,100755..100644
--- 1/docs/en/api-guides/wifi.rst
--- 2/docs/en/api-guides/wifi.rst
+++ b/docs/en/api-guides/wifi.rst
author	Jiang Jiang Jian <jack@espressif.com>
	Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)
committer	Jiang Jiang Jian <jack@espressif.com>
	Mon, 4 Jun 2018 09:59:05 +0000 (17:59 +0800)
		1	2
components/esp32/include/esp_wifi.h	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp32/include/esp_wifi_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
docs/en/api-guides/wifi.rst	patch \|	diff1 \|	diff2 \|	blob \| history