diff options
author | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
commit | 485b633824020c557eb60258e1d36975c8c44770 (patch) | |
tree | f48baf73d5a7ae814aae825e7b1405189eab9f0a /freetype/docs/VERSION.DLL | |
parent | c84235ee0d9940e6a779ec306e615603b58a79f2 (diff) | |
parent | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (diff) | |
download | vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.gz vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.bz2 vcxsrv-485b633824020c557eb60258e1d36975c8c44770.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftrfork.c
freetype/src/cff/cffpic.c
freetype/src/pfr/pfrobjs.c
freetype/src/winfonts/winfnt.c
Diffstat (limited to 'freetype/docs/VERSION.DLL')
-rw-r--r-- | freetype/docs/VERSION.DLL | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/freetype/docs/VERSION.DLL b/freetype/docs/VERSION.DLL index 044f6b87d..1dfc8c187 100644 --- a/freetype/docs/VERSION.DLL +++ b/freetype/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.4.9 14.1.8 6.8.1 2.4.8 14.0.8 6.8.0 2.4.7 13.2.7 6.7.2 2.4.6 13.1.7 6.7.1 @@ -134,7 +135,7 @@ other release numbers. ------------------------------------------------------------------------ -Copyright 2002-2011 by +Copyright 2002-2012 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, |