Update freetype to 2.5.4.

third_party/freetype/include/ftxf86.h

Index: third_party/freetype/include/ftxf86.h
diff --git a/core/include/thirdparties/freetype/freetype/ftxf86.h b/third_party/freetype/include/ftxf86.h
similarity index 95%
rename from core/include/thirdparties/freetype/freetype/ftxf86.h
rename to third_party/freetype/include/ftxf86.h
index d7e2dabc4ca7692945b6fb3a1255e5090eaa1eb1..89d1993e1ea846b4d9c8c9ad0023741c07572a00 100644
--- a/core/include/thirdparties/freetype/freetype/ftxf86.h
+++ b/third_party/freetype/include/ftxf86.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Support functions for X11.                                           */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004, 2006, 2007 by                              */
+/*  Copyright 2002-2004, 2006, 2007, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -19,8 +19,8 @@
 #ifndef __FTXF86_H__
 #define __FTXF86_H__
 
-#include "../ft2build.h"
-#include "freetype.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #ifdef FREETYPE_H
 #error "freetype.h of FreeType 1 has been loaded!"
@@ -62,7 +62,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Description>                                                         */
   /*   Return a string describing the format of a given face, using values */
-  /*   which can be used as an X11 FONT_PROPERTY.  Possible values are     */
+  /*   that can be used as an X11 FONT_PROPERTY.  Possible values are      */
   /*   `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
   /*   `PFR', and `Windows~FNT'.                                           */
   /*                                                                       */
@@ -76,7 +76,8 @@ FT_BEGIN_HEADER
   FT_EXPORT( const char* )
   FT_Get_X11_Font_Format( FT_Face  face );
 
- /* */
+  /* */
+
 
 FT_END_HEADER