Wangjialin 6fb2515a5d Merge branch 'master' into driver_merge_tmp/merge_uart ... # Conflicts: # components/esp32/include/esp_err.h		2016-11-10 11:57:19 +08:00
..
gpio.h	Merge branch 'master' into driver_merge_tmp/merge_uart	2016-11-10 11:57:19 +08:00
ledc.h	Modify as Angus's suggestion:	2016-11-04 12:52:34 +08:00
periph_ctrl.h	Modify LEDC driver	2016-09-28 23:20:34 +08:00
uart.h	Minor changes for driver	2016-11-07 14:16:52 +08:00