Merge branch 'master' into eddystone

This commit is contained in:
Peli de Halleux
2016-11-29 23:27:49 -08:00
25 changed files with 1577 additions and 115 deletions

View File

@ -161,10 +161,10 @@
},
"compileService": {
"yottaTarget": "bbc-microbit-classic-gcc",
"yottaCorePackage": "pxt-microbit-core",
"githubCorePackage": "microsoft/pxt-microbit-core",
"gittag": "v0.5.1",
"serviceId": "ws"
"yottaCorePackage": "microbit",
"githubCorePackage": "lancaster-university/microbit",
"gittag": "v2.0.0-rc6",
"serviceId": "microbit"
},
"serial": {
"manufacturerFilter": "^mbed$",
@ -189,6 +189,7 @@
"termsOfUseUrl": "https://go.microsoft.com/fwlink/?LinkID=206977",
"githubUrl": "https://github.com/Microsoft/pxt-microbit",
"projectGallery": "projects",
"crowdinProject": "kindscript",
"boardName": "micro:bit",
"sideDoc": "getting-started",
"browserSupport": [
@ -248,6 +249,7 @@
"path": "/device"
}
],
"hasReferenceDocs": true,
"usbDocs": "/device/usb",
"usbHelp": [
{