Merge branch 'master' into projects-edits-02

This commit is contained in:
Peli de Halleux 2017-12-01 16:28:15 -08:00 committed by GitHub
commit 02d66a2162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "pxt-microbit",
"version": "0.13.39",
"version": "0.13.41",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "pxt-microbit",
"version": "0.13.40",
"version": "0.13.41",
"description": "micro:bit target for Microsoft MakeCode (PXT)",
"keywords": [
"JavaScript",

View File

@ -201,7 +201,7 @@
"serviceId": "microbit"
},
"serial": {
"nameFilter": "^mbed Serial Port",
"nameFilter": "^(mbed Serial Port|DAPLink CMSIS-DAP)",
"log": true,
"useEditor": true,
"editorTheme": {
@ -363,4 +363,4 @@
"editor.background": "#ecf0f1"
}
}
}
}