System Administrator 2d7a108e79 Fix merge conflict

2017-12-07 16:28:30 -08:00

..

_locales

Restore 'play sound effect' name

2017-12-01 09:59:59 -08:00

melodies.ts

Separate blocks for 'play sound' and 'play sound until done'

2017-11-30 15:49:50 -08:00

music.cpp

…

piano.ts

Default piano note should be 1046

2017-11-30 12:44:22 -08:00

pins.cpp

…

pxt.json

…

shims.d.ts

…

sounds.jres

…

sounds.ts

Fix merge conflict

2017-12-07 16:28:30 -08:00

test.ts

…

tsconfig.json

…