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/fcconfig.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/fcconfig.fncs')
| -rw-r--r-- | fontconfig/doc/fcconfig.fncs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fontconfig/doc/fcconfig.fncs b/fontconfig/doc/fcconfig.fncs index 0491a566f..24d7121e4 100644 --- a/fontconfig/doc/fcconfig.fncs +++ b/fontconfig/doc/fcconfig.fncs @@ -378,6 +378,7 @@ parse error, semantic error or allocation failure. Otherwise returns FcTrue. @PURPOSE@ Obtain the system root directory @DESC@ Obtrains the system root directory in 'config' if available. +@SINCE@ 2.10.92 @@ @RET@ void @@ -390,5 +391,6 @@ Set 'sysroot' as the system root directory. fontconfig prepend 'sysroot' to the cache directories in order to allow people to generate caches at the build time. Note that this causes changing current config. i.e. this function calls FcConfigSetCurrent() internally. +@SINCE@ 2.10.92 @@ |