merged microbit changes

2016-10-17 13:36:54 -07:00
parent 5cce86ec7e 790b9f557a
commit a331a017b8
34 changed files with 270 additions and 90 deletions
--- a/libs/core/pxt.json
+++ b/libs/core/pxt.json
@ -33,7 +33,9 @@
        "parts/speaker.svg",
        "parts/headphone.svg",
        "parts/dcmotor.svg",
-        "_locales/fr/microbit-jsdoc-strings.json"
+        "_locales/ja/core-jsdoc-strings.json",
+        "_locales/ja/core-strings.json",
+        "_locales/fr/core-jsdoc-strings.json"
    ],
    "public": true,
    "dependencies": {},