From 360fe27b55c93c9c6c86895dbbf5db3efc66cc43 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 28 Feb 2015 07:31:25 -0500
Subject: Updated to freetype 2.5.5

Conflicts:
	freetype/src/base/ftbdf.c
	freetype/src/base/fttype1.c
	freetype/src/pfr/pfrobjs.c
---
 freetype/include/ftincrem.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'freetype/include/ftincrem.h')

diff --git a/freetype/include/ftincrem.h b/freetype/include/ftincrem.h
index 5cbca43ef..a72ddef5c 100644
--- a/freetype/include/ftincrem.h
+++ b/freetype/include/ftincrem.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType incremental loading (specification).                        */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2006, 2007, 2008, 2010 by                        */
+/*  Copyright 2002, 2003, 2006-2008, 2010, 2014 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -45,7 +45,7 @@ FT_BEGIN_HEADER
    * @description:
    *   This section contains various functions used to perform so-called
    *   `incremental' glyph loading.  This is a mode where all glyphs loaded
-   *   from a given @FT_Face are provided by the client application,
+   *   from a given @FT_Face are provided by the client application.
    *
    *   Apart from that, all other tables are loaded normally from the font
    *   file.  This mode is useful when FreeType is used within another
@@ -345,6 +345,7 @@ FT_BEGIN_HEADER
 
   /* */
 
+
 FT_END_HEADER
 
 #endif /* __FTINCREM_H__ */
-- 
cgit v1.2.3