diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-15 20:23:58 +0100 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-12-15 20:23:58 +0100 |
commit | 72ce040054f1ee20576094220075af4283674720 (patch) | |
tree | e59d2837a45ec81233423fa7aa47c4cfab4fabee /src/common | |
parent | 4a075edfec7cc0810c577b490e4a9231ebdd8afe (diff) | |
parent | a4cf777fb8cb939db10998853fc9e40deb64aa8d (diff) | |
download | colobot-72ce040054f1ee20576094220075af4283674720.tar.gz colobot-72ce040054f1ee20576094220075af4283674720.tar.bz2 colobot-72ce040054f1ee20576094220075af4283674720.zip |
Merge branch 'master' into dev
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/global.h b/src/common/global.h index 864f0a4..2d57ee0 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -165,6 +165,7 @@ enum Error */ enum Language { + LANGUAGE_ENV = -1, LANGUAGE_ENGLISH = 0, LANGUAGE_FRENCH = 1, LANGUAGE_GERMAN = 2, |