mergin changes

This commit is contained in:
Peli de Halleux
2016-04-01 14:44:11 -07:00
5 changed files with 111 additions and 143 deletions

View File

@@ -74,6 +74,10 @@
"simulator": {
"autoRun": true
},
"compileService": {
"gittag": "v0",
"serviceId": "ws"
},
"serial": {
"manufacturerFilter": "^mbed$",
"log": true