Merge branch 'master' into projects-edits-02

2017-12-01 16:28:15 -08:00 · 2017-12-01 16:28:15 -08:00 · 02d66a2162
commit 02d66a2162
parent cfdf30ed04 4d851407f1
3 changed files with 4 additions and 4 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "pxt-microbit",
-  "version": "0.13.39",
+  "version": "0.13.41",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -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",
--- a/pxtarget.json
+++ b/pxtarget.json
@ -201,7 +201,7 @@
        "serviceId": "microbit"
    },
    "serial": {
-        "nameFilter": "^mbed Serial Port",
+        "nameFilter": "^(mbed Serial Port|DAPLink CMSIS-DAP)",
        "log": true,
        "useEditor": true,
        "editorTheme": {