Merge branch 'master' into cooking

diff --git a/doc/gmqcc.1 b/doc/gmqcc.1
index 7ee54c01cab814924cbc17f04fa67e903cd08b86..b5d39eab4578f22ed95fade87d0162def05e98e1 100644 (file)
--- a/doc/gmqcc.1
+++ b/doc/gmqcc.1
@@ -335,7 +335,7 @@ ignored for both cases.
 When compiling original QuakeWorld QC there are instances where
 code overwrites constants. This is considered an error, however
 for QuakeWorld to compile it needs to be treated as a warning
-instead, as such this warning only works when -std=qcc.
+instead, as such this warning only works when \-std=qcc.
 .It Fl W Ns Cm directive-inmacro
 Warn about the use of preprocessor directives inside macros.
 .It Fl W Ns Cm builtins