Merge branch 'master' into vnext

2018-05-09 10:58:01 -07:00
parent 8957bf0647 ce663acc77
commit 442722f12e
11 changed files with 81 additions and 48 deletions
--- a/libs/core/shims.d.ts
+++ b/libs/core/shims.d.ts
@ -428,7 +428,7 @@ declare namespace control {
    function eventTimestamp(): int32;

    /**
-     * Gets a friendly name for the device derived from the its serial number
+     * Make a friendly name for the device based on its serial number
     */
    //% blockId="control_device_name" block="device name" weight=10 blockGap=8
    //% advanced=true shim=control::deviceName