diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/mi | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/mi')
| -rw-r--r-- | xorg-server/mi/miinitext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 38d19bc2f..b1ceaa4dc 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -157,7 +157,7 @@ static ExtensionToggle ExtensionToggleList[] = { #ifdef XF86BIGFONT {"XFree86-Bigfont", &noXFree86BigfontExtension}, #endif -#ifdef XorgLoader +#ifdef XORGSERVER #ifdef XFreeXDGA {"XFree86-DGA", &noXFree86DGAExtension}, #endif |