diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
| commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
| tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /fontconfig/fonts.conf.in | |
| parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
| parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
| download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'fontconfig/fonts.conf.in')
| -rw-r--r-- | fontconfig/fonts.conf.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/fonts.conf.in b/fontconfig/fonts.conf.in index a17c01eeb..533381b9d 100644 --- a/fontconfig/fonts.conf.in +++ b/fontconfig/fonts.conf.in @@ -66,7 +66,7 @@ <!-- Load local system customization file --> - <include ignore_missing="yes">conf.d</include> + <include ignore_missing="yes">@CONFIGDIR@</include> <!-- Font cache directory list --> |