diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /fontconfig/doc/fclangset.fncs | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'fontconfig/doc/fclangset.fncs')
| -rw-r--r-- | fontconfig/doc/fclangset.fncs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fontconfig/doc/fclangset.fncs b/fontconfig/doc/fclangset.fncs index c08d60c70..c7ed83b34 100644 --- a/fontconfig/doc/fclangset.fncs +++ b/fontconfig/doc/fclangset.fncs @@ -68,6 +68,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO <parameter>lang</parameter> should be of the form Ll-Tt where Ll is a two or three letter language from ISO 639 and Tt is a territory from ISO 3166. +@SINCE@ 2.9.0 @@ @RET@ FcLangSet * @@ -77,6 +78,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO @PURPOSE@ Add langsets @DESC@ Returns a set including only those languages found in either <parameter>ls_a</parameter> or <parameter>ls_b</parameter>. +@SINCE@ 2.9.0 @@ @RET@ FcLangSet * @@ -86,6 +88,7 @@ Returns a set including only those languages found in either <parameter>ls_a</pa @PURPOSE@ Subtract langsets @DESC@ Returns a set including only those languages found in <parameter>ls_a</parameter> but not in <parameter>ls_b</parameter>. +@SINCE@ 2.9.0 @@ @RET@ FcLangResult @@ -161,6 +164,8 @@ has no matching language, this function returns FcLangDifferentLang. Returns a string set of the default languages according to the environment variables on the system. This function looks for them in order of FC_LANG, LC_ALL, LC_CTYPE and LANG then. If there are no valid values in those environment variables, "en" will be set as fallback. +@SINCE@ 2.9.91 +@@ @RET@ FcStrSet * @FUNC@ FcLangSetGetLangs @@ -184,6 +189,7 @@ Returns a string set of all known languages. @PURPOSE@ Normalize the language string @DESC@ Returns a string to make <parameter>lang</parameter> suitable on fontconfig. +@SINCE@ 2.10.91 @@ @RET@ const FcCharSet * |