Merge branch 'master' of https://github.com/autopulated/ble-nrf51822 into autopulated-master

This commit is contained in:
Rohit Grover 2015-08-25 10:35:35 +01:00
commit 70a7f88ec4

View file

@ -26,32 +26,22 @@
"source/btle/custom",
"source/common",
"source/nordic-sdk/components",
"source/nordic-sdk/components/libraries",
"source/nordic-sdk/components/libraries/scheduler",
"source/nordic-sdk/components/libraries/util",
"source/nordic-sdk/components/libraries/hci",
"source/nordic-sdk/components/libraries/bootloader_dfu",
"source/nordic-sdk/components/libraries/bootloader_dfu/hci_transport",
"source/nordic-sdk/components/libraries/bootloader_dfu/experimental",
"source/nordic-sdk/components/libraries/crc16",
"source/nordic-sdk/components/softdevice",
"source/nordic-sdk/components/softdevice/s130",
"source/nordic-sdk/components/softdevice/s130/include",
"source/nordic-sdk/components/softdevice/s130/doc",
"source/nordic-sdk/components/softdevice/common",
"source/nordic-sdk/components/softdevice/common/softdevice_handler",
"source/nordic-sdk/components/drivers_nrf",
"source/nordic-sdk/components/drivers_nrf/hal",
"source/nordic-sdk/components/drivers_nrf/ble_flash",
"source/nordic-sdk/components/drivers_nrf/pstorage",
"source/nordic-sdk/components/drivers_nrf/pstorage/config",
"source/nordic-sdk/components/ble",
"source/nordic-sdk/components/ble/ble_radio_notification",
"source/nordic-sdk/components/ble/ble_services",
"source/nordic-sdk/components/ble/ble_services/ble_dfu",
"source/nordic-sdk/components/ble/common",
"source/nordic-sdk/components/ble/device_manager",
"source/nordic-sdk/components/ble/device_manager/config"
],
"targetDependencies": {}
}
}