prova

Fork of BLE_API by Bluetooth Low Energy

Committer:
rgrover1
Date:
Thu Nov 26 12:52:08 2015 +0000
Revision:
947:f3fcaea7d005
Parent:
940:ae3eaccfac3a
Child:
949:1902cbd0dd83
Synchronized with git rev 2c0747f0
Author: Liyou Zhou
Merge branch 'develop' of github.com:LiyouZhou/ble into develop

Conflicts:
ble/services/DFUService.h

Who changed what in which revision?

UserRevisionLine numberNew contents of line
rgrover1 867:b099c28e8e28 1 # Hello!
rgrover1 947:f3fcaea7d005 2 We are an open source project of [ARM mbed](www.mbed.com). Contributions via [pull request](https://github.com/armmbed/yotta/pulls), and [bug reports](https://github.com/armmbed/yotta/issues) are welcome!
rgrover1 867:b099c28e8e28 3
rgrover1 867:b099c28e8e28 4 Please submit your pull request to the 'develop' branch of this module. Commits to develop will merge into master at the time of the next release.
rgrover1 867:b099c28e8e28 5
rgrover1 867:b099c28e8e28 6 # Contributor agreement
rgrover1 947:f3fcaea7d005 7 For your pull request to be accepted, we will need you to agree to our [contributor agreement](http://developer.mbed.org/contributor_agreement/) to give us the necessary rights to use and distribute your contributions. (To click through the agreement create an account on mbed.com and log in.)