Ting-Kuan
|
3e5762d359
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
app/views/play/level_view.coffee
|
2014-04-15 13:33:24 -04:00 |
|
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 |
|
Alexei Nikitin
|
19932d0051
|
Update RU for windows-script-installer
|
2014-04-13 00:25:52 +04:00 |
|
Glen De Cauwsemaecker
|
74f8a469a5
|
Exit script is now also localized
|
2014-04-12 20:49:08 +02:00 |
|
Glen De Cauwsemaecker
|
5c7a255e98
|
License agreement and feedback for that is now also localized
|
2014-04-12 20:34:06 +02:00 |
|
Glen De Cauwsemaecker
|
b95d7d4cb4
|
Fixed grammar error in files
|
2014-04-12 20:18:55 +02:00 |
|