On Sat, Nov 15, 2003 at 03:12:20AM -0500, X Strike Force SVN Repository Admin wrote: > @@ -2442,14 +2449,14 @@ > + When parsing XInput XF86Config options, catch NULL option table instead > of crashing. (David Dawes) > + Fix a double free() that can cause a crash in XCloseIM() (based on > - #5303, Mo DeJong). > + #5303, Mo DeJong). > + Fix for random crashes when a screen fails to initialise (Marc La > France). > + Fix server crash when using Xinerama when application closes. (#A.808, > Tsukahara Ken). > + Fix a SEGV on server reset in the PM3 driver. (Alan Hourihane) > + Fixed GetTimeInMillis() to use deltas instead of absolute time returend > - by gettimeofday(). This ensures time is monotonic in X (Egbert Eich). > + by gettimeofday(). This ensures time is monotonic in X (Egbert Eich). > (Closes: #85365) > + Sync with Type1 font rasterizer from HEAD: > - Some minor include cleanups. (David Dawes) > @@ -4897,3 +4904,6 @@ > $Id$ > > vim:set ai et sts=2 sw=2 tw=78: > +<<<<<<< .mine > +======= > +>>>>>>> .r769 You know, this is really starting to piss me off. -- Daniel Stone <daniels@debian.org> Debian X Strike Force: http://people.debian.org/~branden/xsf/
Attachment:
pgpWP8JyBSgyi.pgp
Description: PGP signature