diff options
| author | herrb <herrb> | 2001-01-27 11:10:38 +0000 |
|---|---|---|
| committer | herrb <herrb> | 2001-01-27 11:10:38 +0000 |
| commit | 400845f0d1bb11f82458e9521517cf906def4f21 (patch) | |
| tree | 8d15e59fd1c40dbef82b0944b0ea6217ff0deda3 | |
| parent | 07f2fcb26195c535fca415c232a9f0871997df66 (diff) | |
clean up a merge pb
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index a97fb96b8..97ccffdaf 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -15,7 +15,6 @@ XFree86 3.3.6a (xx February 2001) 1615. Back port fix for http://www.securityfocus.com/archive/1/139436 from 4.0 (#4181, Matthieu Herrb). 1614. Add Romanian xkb symbols definitions (Cristian Gafton). ->>>>>>> 3.390.2.329 1613. Add DPMS support to I128 driver (Robin Cutshaw). 1612. Fix a problem with the sequence number not being byte-swapped for the reply to the DPMSCapable request (#A.120, Stephen Tse). @@ -6100,4 +6099,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.390.2.330 2001/01/27 00:31:21 herrb Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.390.2.331 2001/01/27 11:07:35 herrb Exp $ |