Scott Erickson 53579b2632 Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade		2014-04-11 22:52:05 -07:00
..
colors_tab.jade	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
edit.jade	Merge branch 'master' into feature/jsondiffpatch	2014-04-11 22:52:05 -07:00
sprite_parser_test.jade	Ready for action, sir!	2014-01-03 10:32:13 -08:00
table.jade	Got rid of CRLF line endings	2014-03-12 16:03:36 +01:00