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/modules.cfg | |
| 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/modules.cfg')
| -rw-r--r-- | freetype/modules.cfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/freetype/modules.cfg b/freetype/modules.cfg index 8d5b6b598..a85378ee7 100644 --- a/freetype/modules.cfg +++ b/freetype/modules.cfg @@ -1,6 +1,6 @@ # modules.cfg # -# Copyright 2005, 2006, 2007, 2009, 2010 by +# Copyright 2005-2007, 2009-2011 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -54,7 +54,7 @@ FONT_MODULES += pfr # PostScript Type 42 font driver. # -# This driver needs the `truetype' module. +# This driver needs the `truetype' and `psaux' modules. FONT_MODULES += type42 # Windows FONT/FNT font driver. See optional extension ftwinfnt.c below |