morant c6c1a63ff0 Merge branch 'feature/194' of https://github.com/morantsur/scratch-vm into develop ...

+ Solve code conflicts, and handle deserialization of 3.0 projects.

# Conflicts:
#	src/index.js
#	test/unit/serialization_sb2.js

2017-01-27 20:05:54 -05:00

..

index.html

Merge branch 'feature/194' of https://github.com/morantsur/scratch-vm into develop

2017-01-27 20:05:54 -05:00

playground.css

Merge remote-tracking branch 'LLK/develop' into develop

2016-10-11 13:47:24 -04:00

playground.js

add audio to playground

2017-01-06 11:49:25 -05:00