- bugfix for merging ini properties (missed a line of code)

source/glest_game/global/config.cpp

@@ -413,6 +413,7 @@ vector<pair<string,string> > Config::getMergedProperties() const {
             pair<string,string> &property = result[j];
             // Take the user property and override the original value
             if(property.first == propertyUser.first) {
+                overrideProperty = true;
                 property.second = propertyUser.second;
                 break;
             }