fdsf

Dependencies:   nrf51-sdk

Fork of nRF51822 by Lancaster University

Committer:
vcoubard
Date:
Mon Jan 11 10:19:05 2016 +0000
Revision:
546:1e147322b2b5
Parent:
541:884f95bf5351
Child:
556:ecc60b339dfa
Synchronized with git rev cc0cf3df
Author: Vincent Coubard
Merge remote-tracking branch 'origin/develop' into characteristicDescriptorDiscovery

Who changed what in which revision?

UserRevisionLine numberNew contents of line
vcoubard 541:884f95bf5351 1 Many of the files in this module have been inherited from the Nordic SDK for
vcoubard 546:1e147322b2b5 2 nRF51822. With the exception of the softdevice, they come with a BSD license
vcoubard 546:1e147322b2b5 3 offered by Nordic for use in mbed. The Nordic Softdevice License Agreement, a
vcoubard 546:1e147322b2b5 4 BSD-like licence for binary distributions, applies to the softdevice. Some
vcoubard 546:1e147322b2b5 5 other files come from the mbed SDK, and are licensed under Apache-2.0. Unless
vcoubard 546:1e147322b2b5 6 specifically indicated otherwise in a file, files are licensed under the
vcoubard 546:1e147322b2b5 7 Apache 2.0 license, as can be found in: apache-2.0.txt. The BSD-like Nordic
vcoubard 546:1e147322b2b5 8 license can be found in BSD-3clause-Nordic.txt. The Nordic Semiconductor Softdevice
vcoubard 546:1e147322b2b5 9 License Agreement can be found in softdevice_nrf51822_licence_agreement.txt.