Ting-Kuan 0e08a4106b Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/localization/de.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat scripts/windows/coco-dev-setup/recycle_bin/git-test.bat		2014-04-12 16:52:14 -04:00
..
Box2dWeb-2.1.a.3.js	Increased maxTranslation in box2d to fix arrow max speed limit problem.	2014-02-11 14:25:35 -08:00
coffeescript-1.6.3.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
difflib.js	Added text diff library to delta view.	2014-04-10 10:24:14 -07:00
diffview.js	Added text diff library to delta view.	2014-04-10 10:24:14 -07:00
easeljs-NEXT.combined.js	Updated createjs.	2014-03-22 09:40:23 -07:00
fancy_select.js	Fixed #97 by updating Fancy Select.	2014-01-08 19:01:26 -08:00
flying-focus.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
hsl-to-rgb.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
idle.js	Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.	2014-03-11 13:59:12 -07:00
jquery-ui-1.10.4.custom.js	Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.	2014-04-11 14:59:09 -07:00
jquery.minicolors.min.js	Improved a bunch of things with the wizard settings view.	2014-02-27 12:25:59 -08:00
jquery.noty.packaged.min.js	Move Noty to vendor folder.	2014-04-01 02:41:04 -04:00
keymaster.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
movieclip-NEXT.min.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
nameGenerator.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
notify-combined.min.js	no message	2014-04-04 12:49:39 -04:00
preloadjs-NEXT.combined.js	Updated createjs.	2014-03-22 09:40:23 -07:00
soundjs-NEXT.combined.js	Reverted soundjs, because the latest version is different/buggy.	2014-03-22 10:12:02 -07:00
SpriteContainer.js	Added the new WebGL enhanced classes for EaselJS.	2014-03-22 10:12:47 -07:00
SpriteStage.js	Added the new WebGL enhanced classes for EaselJS.	2014-03-22 10:12:47 -07:00
string_score.js	Ready for action, sir!	2014-01-03 10:32:13 -08:00
tweenjs-NEXT.combined.js	Fixed #317	2014-02-02 16:31:06 -08:00