Wangjialin a5ad8090cf Merge branch 'master' into driver_merge_tmp/merge_timer ... # Conflicts: # docs/index.rst		2016-11-25 01:07:19 +08:00
..
gpio.h	docs: fix Doxygen warnings, fail CI build on Doxygen warnings	2016-11-16 22:44:22 +08:00
ledc.h	docs: fix Doxygen warnings, fail CI build on Doxygen warnings	2016-11-16 22:44:22 +08:00
pcnt.h	driver: improve pulse counter code	2016-11-24 12:01:21 +08:00
periph_ctrl.h	add pcnt.rst	2016-11-23 19:07:30 +08:00
rmt.h	rmt: add documentation	2016-11-22 01:44:23 +08:00
timer.h	driver: timer	2016-11-23 17:23:21 +08:00
uart.h	uart: use same argument names in get/set functions	2016-11-24 13:56:18 +08:00