diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:17 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:17 +0000 |
| commit | 1daeaf6d08f00f627d734c26d1449285d52b15e3 (patch) | |
| tree | 888797fa9e03db2653e84acaa6300554105cabc1 /src/apm_rush.c | |
| parent | 52e7b836160f07d14f2286cc21a39a7ff9fdb76f (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
Diffstat (limited to 'src/apm_rush.c')
| -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 4c5161a..4e0b745 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.1 2003/12/18 19:29:14 kaleb Exp $ */ +/* $XdotOrg$ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */ /* * Copyright Loïc Grenié 1999 @@ -346,7 +346,7 @@ XFree86RushExtensionInit(ScreenPtr pScreen) { ExtensionEntry* extEntry; -#ifdef XINERAMA +#ifdef PANORAMIX if (!noPanoramiXExtension) return; #endif |