diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
| commit | 1772aa9a9c51332dee3cb942c2d69125ac9a67dc (patch) | |
| tree | 5a18f22bf0d174b014a9d3b1b1723a3d4730c9c6 /xorg-server/hw/xfree86/common/xf86Config.c | |
| parent | cc7c9d67342d9d79ab9f490db492902f7aab2bbb (diff) | |
| parent | d34fc70fab4607f70184206a592397c97c3e478e (diff) | |
| download | vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.gz vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.bz2 vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c index e1283f97f..a6d66f35a 100644 --- a/xorg-server/hw/xfree86/common/xf86Config.c +++ b/xorg-server/hw/xfree86/common/xf86Config.c @@ -249,7 +249,9 @@ xf86ModulelistFromConfig(pointer **optlist) { int count = 0, i = 0; char **modulearray; - char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL }; + char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", + "freetype", "type1", + NULL }; pointer *optarray; XF86LoadPtr modp; Bool found; |