diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
| commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
| tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /fontconfig/doc | |
| parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
| parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
| download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'fontconfig/doc')
| -rw-r--r-- | fontconfig/doc/fclangset.fncs | 8 | ||||
| -rw-r--r-- | fontconfig/doc/func.sgml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/fontconfig/doc/fclangset.fncs b/fontconfig/doc/fclangset.fncs index e2a40b854..c08d60c70 100644 --- a/fontconfig/doc/fclangset.fncs +++ b/fontconfig/doc/fclangset.fncs @@ -178,6 +178,14 @@ Returns a string set of all languages in <parameter>langset</parameter>. Returns a string set of all known languages. @@ +@RET@ FcChar8 * +@FUNC@ FcLangNormalize +@TYPE1@ const FcChar8 * @ARG1@ lang +@PURPOSE@ Normalize the language string +@DESC@ +Returns a string to make <parameter>lang</parameter> suitable on fontconfig. +@@ + @RET@ const FcCharSet * @FUNC@ FcLangGetCharSet @TYPE1@ const FcChar8 * @ARG1@ lang diff --git a/fontconfig/doc/func.sgml b/fontconfig/doc/func.sgml index 88be32047..73e7761ce 100644 --- a/fontconfig/doc/func.sgml +++ b/fontconfig/doc/func.sgml @@ -46,7 +46,7 @@ @?SYNOPSIS@ @SYNOPSIS@ @:@ -#include <fontconfig.h> +#include <fontconfig/fontconfig.h> @;@ </funcsynopsisinfo> @{PROTOTYPE@ |