Wangjialin a5ad8090cf Merge branch 'master' into driver_merge_tmp/merge_timer ... # Conflicts: # docs/index.rst		2016-11-25 01:07:19 +08:00
..
bt.rst	doc: API Reference - examples & fixes	2016-11-21 10:25:11 +08:00
esp_wifi.rst	Revised api files	2016-11-10 22:50:55 +01:00
gpio.rst	Revised api files	2016-11-10 22:50:55 +01:00
ledc.rst	doc: API Reference - examples & fixes	2016-11-21 10:25:11 +08:00
log.rst	Revised api files	2016-11-10 22:50:55 +01:00
nvs_flash.rst	doc: API Reference - examples & fixes	2016-11-21 10:25:11 +08:00
pcnt.rst	driver: improve pulse counter code	2016-11-24 12:01:21 +08:00
rmt.rst	rmt: add documentation	2016-11-22 01:44:23 +08:00
spi_flash.rst	docs: fix broken links, formatting, add SPI flash and partition APIs	2016-11-16 22:44:22 +08:00
template.rst	Revised api files	2016-11-10 22:50:55 +01:00
timer.rst	driver: timer	2016-11-23 17:23:21 +08:00
uart.rst	Revised api files	2016-11-10 22:50:55 +01:00
vfs.rst	doc: API Reference - examples & fixes	2016-11-21 10:25:11 +08:00
wdts.rst	Add documentation	2016-11-17 12:09:08 +08:00