]> granicus.if.org Git - esp-idf/commit
Merge branch 'master' into driver_merge_tmp/merge_uart
authorWangjialin <wangjialin@espressif.com>
Thu, 3 Nov 2016 18:56:41 +0000 (02:56 +0800)
committerWangjialin <wangjialin@espressif.com>
Thu, 3 Nov 2016 18:56:41 +0000 (02:56 +0800)
commit15474b9b7ecb06ace6f307b40cf0d246e63355f6
tree5739a82b688752e96b170fa121b51ac4e63ffde4
parenta6b3be6734b8f8acd13a8f401d046f3531b7a893
parentabecab7525e7edb1fde16ab5d8cf7b368b1d332c
Merge branch 'master' into driver_merge_tmp/merge_uart
components/driver/include/driver/gpio.h
components/driver/include/driver/ledc.h