diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-01 15:06:43 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-01 15:06:43 +0000 |
| commit | a1de09451ae863d975a9ffac390c2a402a52e140 (patch) | |
| tree | f0b468c3490f79e0b581b195a2dffabe4b8f71e8 | |
| parent | ea785be99f10280233c1c9ccc9e431014118e876 (diff) | |
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).
| -rw-r--r-- | src/apm_rush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/apm_rush.c b/src/apm_rush.c index 3adda70..cd51163 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.2 2004/02/25 21:46:48 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */ /* * Copyright Loïc Grenié 1999 @@ -347,7 +347,7 @@ XFree86RushExtensionInit(ScreenPtr pScreen) ExtensionEntry* extEntry; #ifdef XINERAMA - if (!noXineramaExtension) + if (!noPanoramiXExtension) return; #endif if (rush_ext_generation == serverGeneration) { |