codecombat/app/styles/editor
Scott Erickson dbbf9ce8b3 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
Conflicts:
	app/styles/editor/level/thangs_tab.sass
	app/templates/editor/level/thangs_tab.jade
	app/views/editor/level/thangs_tab_view.coffee
2014-03-20 11:22:23 -07:00
..
article Ready for action, sir! 2014-01-03 10:32:13 -08:00
components Added some basic control tips to the thang components edit view. 2014-01-30 12:07:01 -08:00
level Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master 2014-03-20 11:22:23 -07:00
thang Added a 'stop' button for viewing end animations on thang types. 2014-02-12 16:18:25 -08:00