v2

Dependencies:   BLE_API mbed DOOR

Fork of DOOR by Aura-Tech Solutions

Files at this revision

API Documentation at this revision

Comitter:
Rohit Grover
Date:
Fri Jul 04 15:21:08 2014 +0100
Parent:
37:205deeded79d
Parent:
36:282289e1c629
Child:
39:1dfed56efe26
Commit message:
resolve merge

Changed in this revision

--- a/BLE_API.lib	Fri Jul 04 15:14:58 2014 +0100
+++ b/BLE_API.lib	Fri Jul 04 15:21:08 2014 +0100
@@ -1,1 +1,1 @@
-http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#e2c50c4a1e9a
+http://mbed.org/teams/Bluetooth-Low-Energy/code/BLE_API/#5d2102351bf4
--- a/mbed.bld	Fri Jul 04 15:14:58 2014 +0100
+++ b/mbed.bld	Fri Jul 04 15:21:08 2014 +0100
@@ -1,1 +1,1 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/7d30d6019079
\ No newline at end of file
+http://mbed.org/users/mbed_official/code/mbed/builds/024bf7f99721
\ No newline at end of file
--- a/nRF51822.lib	Fri Jul 04 15:14:58 2014 +0100
+++ b/nRF51822.lib	Fri Jul 04 15:21:08 2014 +0100
@@ -1,1 +1,1 @@
-http://mbed.org/teams/Nordic-Semiconductor/code/nRF51822/#3444ee6fd548
+http://mbed.org/teams/Nordic-Semiconductor/code/nRF51822/#c3ce6ee5d300