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
..
config	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 16:52:14 -04:00
localisation	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 16:52:14 -04:00
localization	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 16:52:14 -04:00
scripts	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 16:52:14 -04:00
configuration.exe	Generated an exe file for the configuration.batch redirection script	2014-04-11 00:35:45 +02:00
setup.bat	Git remote configuratin added and replaced setup root file by installer exe with icon	2014-04-09 02:59:06 +02:00
setup.exe	Git remote configuratin added and replaced setup root file by installer exe with icon	2014-04-09 02:59:06 +02:00