diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
| commit | d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (patch) | |
| tree | db56fe01d61a824e4bd975cbf8603b11e9c5ecdf /fontconfig/conf.d | |
| parent | d2dacc6bc44f7dc245dee6e66723013afb49cfb5 (diff) | |
| parent | f543ceaca6820260f15a4eff86938214cf43c7d2 (diff) | |
| download | vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.gz vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.bz2 vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/conf.d')
| -rw-r--r-- | fontconfig/conf.d/50-user.conf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fontconfig/conf.d/50-user.conf b/fontconfig/conf.d/50-user.conf index 3f8901296..2f1040898 100644 --- a/fontconfig/conf.d/50-user.conf +++ b/fontconfig/conf.d/50-user.conf @@ -2,6 +2,9 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <!-- Load per-user customization file --> - <include ignore_missing="yes">~/.fonts.conf.d</include> - <include ignore_missing="yes">~/.fonts.conf</include> + <include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include> + <include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include> + <!-- the following elements will be removed in the future --> + <include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include> + <include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include> </fontconfig> |