c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into projects-edits-02

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

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

2
package.json
View File

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

4
pxtarget.json
View File

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