From: Wolfgang Bumiller Date: Mon, 30 Sep 2013 13:02:03 +0000 (+0200) Subject: Merge branch 'master' into cooking X-Git-Tag: 0.3.5~56^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=fa14ca93d2b60f722d55c24214fde7ac84581ad0;hp=03b56bd41f087b8310ce9f6341106f8f82c133ce Merge branch 'master' into cooking --- diff --git a/doc/gmqcc.1 b/doc/gmqcc.1 index 185092e..c825a41 100644 --- a/doc/gmqcc.1 +++ b/doc/gmqcc.1 @@ -153,7 +153,7 @@ Adds compiler information to the generated binary file. Currently this includes the following globals: .Bl -tag -width indent -compact .It Li reserved:version -String containing the compiler version as printed by the --version +String containing the compiler version as printed by the \-\-version parameter. .El .It Fl -correct , Fl -no-correct @@ -356,7 +356,7 @@ features used in the Xonotic codebase. If you need more, write a ticket. .It Fl f Ns Cm ftepp-predefs Enable some predefined macros. This only works in combination with -\'-fftepp' and is currently not included by '-std=fteqcc'. The +\'\-fftepp' and is currently not included by '\-std=fteqcc'. The following macros will be added: .Bd -literal -offset indent __LINE__ @@ -678,7 +678,7 @@ A documented example for a gmqcc.ini file. .Sh AUTHOR See . .Sh BUGS -Currently the '-fftepp-predefs' flag is not included by '-std=fteqcc', +Currently the '\-fftepp-predefs' flag is not included by '\-std=fteqcc', partially because it is not entirely conformant to fteqcc. .Pp Please report bugs on ,