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
..
localized	Readme at end of installation is now also localized	2014-04-12 20:38:26 +02:00
config.coco	Moved language selection to the top and starting localized the hardcoded stuff.	2014-04-12 16:55:59 +02:00
downloads.coco	Seperated win7 and win8 to prevent any future awkwardness	2014-04-12 21:15:36 +02:00
finished_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
github_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
header.coco	new variable system implemented and refactored a lot of files already.	2014-03-21 03:26:26 +01:00
install_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
npm_and_brunch_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00