diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /fontconfig/conf.d/50-user.conf | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'fontconfig/conf.d/50-user.conf')
| -rw-r--r-- | fontconfig/conf.d/50-user.conf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fontconfig/conf.d/50-user.conf b/fontconfig/conf.d/50-user.conf index 2f1040898..07c9182e7 100644 --- a/fontconfig/conf.d/50-user.conf +++ b/fontconfig/conf.d/50-user.conf @@ -1,7 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> - <!-- Load per-user customization file --> + <!-- + Load per-user customization files where stored on XDG Base Directory + specification compliant places. it should be usually: + $HOME/.config/fontconfig/conf.d + $HOME/.config/fontconfig/fonts.conf + --> <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 --> |