diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-21 11:18:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-21 11:18:17 +0200 |
| commit | 039fb6c83783fff3b92f1e7934ce4702cedb1722 (patch) | |
| tree | bb971ed2e247f7d311b696e62c7ed4d66b199b6d /freetype/docs/reference/ft2-version.html | |
| parent | 84f6a75a56f4749f91a51a161c1989cbc8807b80 (diff) | |
| parent | fa791414601df61d20d860299dba80fdb62565df (diff) | |
| download | vcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.tar.gz vcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.tar.bz2 vcxsrv-039fb6c83783fff3b92f1e7934ce4702cedb1722.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Upgraded freetype to 2.5.0.1
Conflicts:
freetype/src/base/ftcalc.c
freetype/src/base/ftgloadr.c
freetype/src/base/ftgxval.c
freetype/src/base/ftotval.c
freetype/src/base/ftoutln.c
freetype/src/base/ftpfr.c
freetype/src/base/fttrigon.c
freetype/src/cff/cffobjs.c
freetype/src/psaux/afmparse.c
freetype/src/psnames/psmodule.c
freetype/src/raster/ftraster.c
freetype/src/raster/ftrend1.c
freetype/src/sfnt/ttsbit.c
freetype/src/sfnt/ttsbit0.c
freetype/src/truetype/ttobjs.c
freetype/src/truetype/ttsubpix.c
freetype/src/type1/t1afm.c
Diffstat (limited to 'freetype/docs/reference/ft2-version.html')
| -rw-r--r-- | freetype/docs/reference/ft2-version.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/docs/reference/ft2-version.html b/freetype/docs/reference/ft2-version.html index 981f0c4b8..ea580ade7 100644 --- a/freetype/docs/reference/ft2-version.html +++ b/freetype/docs/reference/ft2-version.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.4.11 API Reference</title> +<title>FreeType-2.5.0 API Reference</title> <style type="text/css"> body { font-family: Verdana, Geneva, Arial, Helvetica, serif; color: #000000; @@ -35,7 +35,7 @@ <table align=center><tr><td><font size=-1>[<a href="ft2-index.html">Index</a>]</font></td> <td width="100%"></td> <td><font size=-1>[<a href="ft2-toc.html">TOC</a>]</font></td></tr></table> -<center><h1>FreeType-2.4.11 API Reference</h1></center> +<center><h1>FreeType-2.5.0 API Reference</h1></center> <center><h1> FreeType Version @@ -57,8 +57,8 @@ Defined in FT_FREETYPE_H (freetype/freetype.h). <table align=center width="87%"><tr bgcolor="#D6E8FF"><td><pre> #define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MAJOR</a> 2 -#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a> 4 -#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a> 11 +#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_MINOR</a> 5 +#define <a href="ft2-version.html#FREETYPE_XXX">FREETYPE_PATCH</a> 0 </pre></table><br> <table align=center width="87%"><tr><td> |