diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-08 12:40:16 +0100 |
| commit | c2ada0e240f7c721ed09c9570b5375833c47370c (patch) | |
| tree | edf46fc67b3b6af1a10b2e5e223712fdc6dc77ea /fontconfig/conf.d/Makefile.am | |
| parent | 066de3c6d46ca099caba474b8e7d132ec772bc65 (diff) | |
| parent | 8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff) | |
| download | vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.gz vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.tar.bz2 vcxsrv-c2ada0e240f7c721ed09c9570b5375833c47370c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 8 jan 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'fontconfig/conf.d/Makefile.am')
| -rw-r--r-- | fontconfig/conf.d/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am index e3a26f081..77597e57f 100644 --- a/fontconfig/conf.d/Makefile.am +++ b/fontconfig/conf.d/Makefile.am @@ -25,6 +25,7 @@ DOC_FILES= \ README CONF_LINKS = \ + 10-scale-bitmap-fonts.conf \ 20-unhint-small-vera.conf \ 30-urw-aliases.conf \ 30-metric-aliases.conf \ @@ -49,6 +50,7 @@ templatedir = $(TEMPLATEDIR) template_DATA = \ 10-autohint.conf \ 10-no-sub-pixel.conf \ + 10-scale-bitmap-fonts.conf \ 10-sub-pixel-bgr.conf \ 10-sub-pixel-rgb.conf \ 10-sub-pixel-vbgr.conf \ |