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/fcdircache.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/fcdircache.fncs')
-rw-r--r-- | fontconfig/doc/fcdircache.fncs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fontconfig/doc/fcdircache.fncs b/fontconfig/doc/fcdircache.fncs index ab5e3d9a0..faeba2928 100644 --- a/fontconfig/doc/fcdircache.fncs +++ b/fontconfig/doc/fcdircache.fncs @@ -62,6 +62,7 @@ FcDirCacheRead. @DESC@ Re-scan directories only at <parameter>dir</parameter> and update the cache. returns NULL if failed. +@SINCE@ 2.11.1 @@ @RET@ FcCache * |