Commit Graph

4 Commits

Author SHA1 Message Date
Tian Hao
7a41ab6982 Merge branch 'master' into feature/btdm_bluedroid
1. update bt lib submodule

# Conflicts:
#	components/bootloader/src/main/esp32.bootloader.ld
#	components/bt/component.mk
#	components/esp32/component.mk
#	components/esp32/lib
2016-11-24 15:45:04 +08:00
Angus Gratton
751736f902 ble_adv example: Remove int return value from app_main() 2016-11-14 15:55:26 +11:00
Tian Hao
aa6fe04148 component/bt : cleanup the liscence header 2016-11-05 02:48:16 +08:00
Angus Gratton
6850751ee8 Add very simple "hello world" & "blink" examples 2016-09-27 12:06:54 +10:00