Merge branch 'master' into martin-t/defaults

diff --git a/defaultClient.cfg b/defaultClient.cfg
index b31464e8fecbfcda37fd9a0d52cb26411caf79b5..58d8b157321a3e18db944953a3fd344d654c79d5 100644 (file)
--- a/defaultClient.cfg
+++ b/defaultClient.cfg
@@ -283,7 +283,9 @@ r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1
 r_glsl_offsetmapping_reliefmapping 0
 r_glsl_offsetmapping_scale 0.02
-// execute effects-normal.cfg to make sure that all effect settings are reset
+
+// create a temporary empty alias for menu_sync so that execution of effects-normal.cfg
+// on game start doesn't show an error message in the console
 alias menu_sync "" // will be re-aliased later
 
 scr_conalpha 1