diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-06 13:24:24 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-06 13:24:24 +0000 |
| commit | 82ccd4330983a1ca51dc4ea44bdfa380f2d79d39 (patch) | |
| tree | 2ae5a274269250cea5699f0fd5719e4ce04cdd68 | |
| parent | 45ac28411cd66380aaab9ccc2c7e2ffd270323c0 (diff) | |
merge XFree86 4.3.99.901 (RC1) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/s3_accel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/s3_accel.c b/src/s3_accel.c index 8c3ceac..16d9238 100644 --- a/src/s3_accel.c +++ b/src/s3_accel.c @@ -24,7 +24,8 @@ * * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.3 2003/11/23 18:07:31 twini Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.3 2003/11/23 18:07:31 twini Exp $ */ #include "xf86.h" @@ -310,7 +311,7 @@ static void S3SubsequentSolidBresenhamLine(ScrnInfoPtr pScrn, int error, e1, e2; error = minor + err; - e1 = major; + e1 = minor; /* was: major, wrong (twini@xfree86.org) */ e2 = minor - major; if (major) { |