[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/Makefile.am |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2084b76bea78f9a41349de57d76134efd5174d96
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Fri Sep 15 22:52:52 2017 +0200

    build: Remove references to deleted file
    
    Commit cc67d7df17 removed 30-urw-aliases.conf, so don't try to
    install it.

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index fd50a5d..ff03fb2 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -29,7 +29,6 @@ CONF_LINKS = \
 	10-hinting-$(PREFERRED_HINTING).conf	\
 	10-scale-bitmap-fonts.conf \
 	20-unhint-small-vera.conf \
-	30-urw-aliases.conf \
 	30-metric-aliases.conf \
 	40-nonlatin.conf \
 	45-generic.conf \
@@ -70,7 +69,6 @@ template_DATA =				\
 	11-lcdfilter-light.conf		\
 	20-unhint-small-vera.conf	\
 	25-unhint-nonlatin.conf		\
-	30-urw-aliases.conf		\
 	30-metric-aliases.conf		\
 	40-nonlatin.conf		\
 	45-generic.conf			\