4 Commits

Include renames

Author	SHA1	Message	Date
Ray Schamp	f785117e1d	Lint and fix failing tests	2017-04-27 17:49:57 -04:00
Ray Schamp	2a4af8a9ca	Fix up most linting/merge errors	2017-04-26 16:50:53 -04:00
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
Andrew Sliwinski	6d83931341	WIP clean-up	2016-12-30 10:19:58 -05:00