Scott Erickson 3dc3f62473 Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee		2014-04-25 14:31:58 -07:00
..
add.coffee	#889 - moved CocoCollection.coffee to app/collections and updated references	2014-04-22 20:42:26 +01:00
edit.coffee	Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.	2014-04-17 14:23:33 -07:00
new.coffee	Refactored SuperModel, CocoModel and LevelLoader.	2014-04-25 14:30:06 -07:00