Cristiano Barbosa / microbit-dal2

security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

module.json@74:8cb1c4aa4527, 2018-01-26 (annotated)

Committer:
cristianobarbosa
Date:
Fri Jan 26 14:11:55 2018 +0000
Revision:
74:8cb1c4aa4527
Parent:
68:9dd4fb5caf0a 
sender

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jonathan Austin 1:8aa5cdb4ab67 1 {
Jonathan Austin 1:8aa5cdb4ab67 2 "name": "microbit-dal",
LancasterUniversity 68:9dd4fb5caf0a 3 "version": "2.0.0-rc4",
Jonathan Austin 1:8aa5cdb4ab67 4 "license": "MIT",
Jonathan Austin 1:8aa5cdb4ab67 5 "description": "The runtime library for the BBC micro:bit, developed by Lancaster University",
Jonathan Austin 1:8aa5cdb4ab67 6 "keywords": [
Jonathan Austin 1:8aa5cdb4ab67 7 "mbed-classic",
Jonathan Austin 1:8aa5cdb4ab67 8 "microbit",
Jonathan Austin 1:8aa5cdb4ab67 9 "runtime",
Jonathan Austin 1:8aa5cdb4ab67 10 "library",
Jonathan Austin 1:8aa5cdb4ab67 11 "lancaster",
Jonathan Austin 1:8aa5cdb4ab67 12 "University"
Jonathan Austin 1:8aa5cdb4ab67 13 ],
Jonathan Austin 1:8aa5cdb4ab67 14 "author": "Joe Finney <j.finney@lancaster.ac.uk (mailto:j.finney@lancaster.ac.uk) >",
Jonathan Austin 1:8aa5cdb4ab67 15 "homepage": "https://github.com/lancaster-university/microbit-dal/",
Jonathan Austin 1:8aa5cdb4ab67 16 "dependencies": {
LancasterUniversity 66:2fc7d7c2fffc 17 "mbed-classic": "lancaster-university/mbed-classic#microbit_hfclk+mb5",
Jonathan Austin 1:8aa5cdb4ab67 18 "ble": "lancaster-university/BLE_API#v2.5.0+mb3",
LancasterUniversity 13:8d33728584d9 19 "ble-nrf51822": "lancaster-university/nrf51822#v2.5.0+mb6",
LancasterUniversity 15:65509c60005c 20 "nrf51-sdk": "lancaster-university/nrf51-sdk#v2.2.0+mb4"
Jonathan Austin 1:8aa5cdb4ab67 21 },
Jonathan Austin 1:8aa5cdb4ab67 22 "extraIncludes": [
Jonathan Austin 1:8aa5cdb4ab67 23 "inc/core",
Jonathan Austin 1:8aa5cdb4ab67 24 "inc/types",
Jonathan Austin 1:8aa5cdb4ab67 25 "inc/drivers",
LancasterUniversity 27:2f494ead23de 26 "inc/bluetooth",
LancasterUniversity 27:2f494ead23de 27 "inc/platform"
Jonathan Austin 1:8aa5cdb4ab67 28 ]
LancasterUniversity 9:960ce8922159 29 }