[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 conf.d/Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dc11dd581f228623f0f14b3a6a1e4beaa659266b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jan 7 16:41:29 2013 -0600

    Add 10-scale-bitmap-fonts.conf and enable by default

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index e3a26f0..77597e5 100644
--- a/conf.d/Makefile.am
+++ b/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		\