Matthias Ringwald f55dd2ad86 Merge branch 'master' into ble-api-cleanup ...

Conflicts:
	tool/generate.py

2015-12-18 21:47:34 +01:00

..

.gitignore

use singular chipset

2015-10-31 19:33:49 +01:00

ant_cmds.c

fix paths after source reorg

2015-11-13 15:04:41 +01:00

ant_cmds.h

move ant_cmds.h to ant_cmds.c

2015-11-13 10:22:31 +01:00

bt_control_cc256x.c

use singular chipset

2015-10-31 19:33:49 +01:00

bt_control_cc256x.h

use singular chipset

2015-10-31 19:33:49 +01:00

convert_bts_init_scripts.py

Merge branch 'master' into ble-api-cleanup

2015-12-18 21:47:34 +01:00

Makefile.inc

use singular chipset

2015-10-31 19:33:49 +01:00