[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-devel.sgml |    2 +-
 doc/fontconfig-user.sgml  |    2 +-
 fontconfig/fontconfig.h   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7e44a0b5a88e597b33ba9e2cc3a6d4555736db0a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Sep 10 17:45:11 2013 +0900

    Bug 68955 - Deprecate / remove FC_RASTERIZER

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index a7b8530..7306d79 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -170,7 +170,7 @@ convenience for the application's rendering mechanism.
                                                   the file
     ftface         FC_FT_FACE             FT_Face Use the specified FreeType
                                                   face object
-    rasterizer     FC_RASTERIZER          String  Which rasterizer is in use
+    rasterizer     FC_RASTERIZER          String  Which rasterizer is in use (deprecated)
     outline        FC_OUTLINE             Bool    Whether the glyphs are outlines
     scalable       FC_SCALABLE            Bool    Whether glyphs can be scaled
     scale          FC_SCALE               Double  Scale factor for point->pixel
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index eeff69a..775d1f7 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -116,7 +116,7 @@ convenience for the applications' rendering mechanism.
   file            String  The filename holding the font
   index           Int     The index of the font within the file
   ftface          FT_Face Use the specified FreeType face object
-  rasterizer      String  Which rasterizer is in use
+  rasterizer      String  Which rasterizer is in use (deprecated)
   outline         Bool    Whether the glyphs are outlines
   scalable        Bool    Whether glyphs can be scaled
   scale           Double  Scale factor for point->pixel conversions
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 079177d..58912f5 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -91,7 +91,7 @@ typedef int		FcBool;
 #define FC_FILE		    "file"		/* String */
 #define FC_INDEX	    "index"		/* Int */
 #define FC_FT_FACE	    "ftface"		/* FT_Face */
-#define FC_RASTERIZER	    "rasterizer"	/* String */
+#define FC_RASTERIZER	    "rasterizer"	/* String (deprecated) */
 #define FC_OUTLINE	    "outline"		/* Bool */
 #define FC_SCALABLE	    "scalable"		/* Bool */
 #define FC_SCALE	    "scale"		/* double */