[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 fonts.conf.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 007cae508c831561c7a4f06092858ea7bf517e2e
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Wed Oct 24 21:52:56 2007 -0700

    Move <cachedir> elements to the end of fonts.conf.
    
    This allows users to select alternate directories for cache files, ahead of
    the 'standard' directories.

diff --git a/fonts.conf.in b/fonts.conf.in
index 99f2ee5..5c273b2 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -27,11 +27,6 @@
 	@FC_FONTPATH@
 	<dir>~/.fonts</dir>
 
-<!-- Font cache directory list -->
-
-	<cachedir>@FC_CACHEDIR@</cachedir>
-	<cachedir>~/.fontconfig</cachedir>
-
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -73,6 +68,11 @@
 -->
 	<include ignore_missing="yes">conf.d</include>
 
+<!-- Font cache directory list -->
+
+	<cachedir>@FC_CACHEDIR@</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
+
 	<config>
 <!--
   These are the default Unicode chars that are expected to be blank