Merge to XFA: Update bundled freetype to 2.6.1

third_party/freetype/src/raster/ftmisc.h

Index: third_party/freetype/src/raster/ftmisc.h
diff --git a/third_party/freetype/src/raster/ftmisc.h b/third_party/freetype/src/raster/ftmisc.h
index 703155a4291edfc78038c82df39970ab1d35fcce..b87e0b62b727e3580cd04e56d7167f43fda39c5d 100644
--- a/third_party/freetype/src/raster/ftmisc.h
+++ b/third_party/freetype/src/raster/ftmisc.h
@@ -5,7 +5,7 @@
 /*    Miscellaneous macros for stand-alone rasterizer (specification       */
 /*    only).                                                               */
 /*                                                                         */
-/*  Copyright 2005, 2009, 2010 by                                          */
+/*  Copyright 2005-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used        */
@@ -37,7 +37,7 @@
 #define FT_LOCAL_DEF( x )   static x
 
 
-  /* from include/freetype2/fttypes.h */
+  /* from include/freetype/fttypes.h */
 
   typedef unsigned char  FT_Byte;
   typedef signed int     FT_Int;
@@ -54,7 +54,7 @@
               (FT_ULong)_x4         )
 
 
-  /* from include/freetype2/ftsystem.h */
+  /* from include/freetype/ftsystem.h */
 
   typedef struct FT_MemoryRec_*  FT_Memory;