merge

diff --cc Data/config.txt
index fc8049b6bbbeb502301e43deb03acb9542e450b5,203c615fadae7c3efd01178c31f47811010558a5..4759143d8bb572d42c3d782d6b9f53148caaba8c
--- 1/Data/config.txt
--- 2/Data/config.txt
+++ b/Data/config.txt
@@@ -70,5 -70,9 +70,11 @@@ Attack key
  mouse1
  Chat key:
  unknown
 +Damage bar:
 +1
+ StereoMode:
+ 0
+ StereoSeparation:
+ 0.05
+ StereoReverse:
+ 0

diff --cc Source/GameDraw.cpp
Simple merge

diff --cc Source/GameTick.cpp
Simple merge

diff --cc Source/Globals.cpp
Simple merge

diff --cc Source/OpenGL_Windows.cpp
Simple merge

diff --cc Source/Settings.cpp
index 7f90a0756820941c5ad3b370d636a8e91e656417,754c2ac4e316ec2c0a995dcebfd741227ba3009d..b2c761ddbe312dbe1fabc825ab2d19b100ac8aa4
--- 1/Source/Settings.cpp
--- 2/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@@ -118,8 -117,13 +118,14 @@@ void SaveSettings(Game &game) 
        opstream << KeyToChar(game.attackkey);
        opstream << "\nChat key:\n";
        opstream << KeyToChar(game.chatkey);
 -      
 +      opstream << "\nDamage bar:\n";
 +      opstream << showdamagebar;
+       opstream << "\nStereoMode:\n";
+       opstream << stereomode;
+       opstream << "\nStereoSeparation:\n";
+       opstream << stereoseparation;
+       opstream << "\nStereoReverse:\n";
+       opstream << stereoreverse;
        opstream.close();
  }
  
@@@ -236,8 -240,14 +242,16 @@@ bool LoadSettings(Game &game) 
                } else if ( !strncmp(setting, "Chat key", 8) ) {
                        ipstream >> string;
                        game.chatkey = CharToKey(string);
 +              } else if ( !strncmp(setting, "Damage bar", 10) ) {
 +                      ipstream >> showdamagebar;
+               } else if ( !strncmp(setting, "StereoMode", 10) ) {
+                       int i;
+                       ipstream >> i;
+                       stereomode = (StereoMode)i;
+               } else if ( !strncmp(setting, "StereoSeparation", 16) ) {
+                       ipstream >> stereoseparation;
+               } else if ( !strncmp(setting, "StereoReverse", 13) ) {
+                       ipstream >> stereoreverse;
                } else {
                        ipstream >> string;
                        fprintf(stderr, "Unknown config option '%s' with value '%s'. Ignoring.\n", setting, string);