aa

Dependents:   Peripheral_1_serial_copy Peripheral_1_serial 151006_1st_Scenario_normal

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
rgrover1
Date:
Fri Sep 25 15:26:59 2015 +0100
Parent:
447:0933593620b5
Commit message:
Synchronized with git rev ad59bf47
Author: Rohit Grover
Merge branch 'develop'

Changed in this revision

LICENSE Show annotated file Show diff for this revision Revisions of this file
diff -r 0933593620b5 -r 088f5738bf18 LICENSE
--- a/LICENSE	Fri Sep 25 15:26:59 2015 +0100
+++ b/LICENSE	Fri Sep 25 15:26:59 2015 +0100
@@ -1,6 +1,6 @@
 Many of the files in this module have been inherited from the Nordic SDK for
-nRF51822; they come with a BSD-like license offered by Nordic for use with mbed.
-Others come from the mbed SDK, and are licensed under Apache-2.0.
+nRF51822; they come with a BSD-like license offered by Nordic for use in mbed.
+Some other files come from the mbed SDK, and are licensed under Apache-2.0.
 Unless specifically indicated otherwise in a file, files are licensed
 under the Apache 2.0 license, as can be found in: apache-2.0.txt.
 The BSD-like Nordic license can be found in BSD-3clause-Nordic.txt
\ No newline at end of file