[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: rev 771 - branches/4.3.0/sid/debian



Author: daniel
Date: 2003-11-15 04:04:26 -0500 (Sat, 15 Nov 2003)
New Revision: 771

Modified:
   branches/4.3.0/sid/debian/changelog
Log:
debian/changelog: fix braindamage introduced by #770, and fix up a typo this
conveniently pointed me to.


Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog	2003-11-15 08:12:06 UTC (rev 770)
+++ branches/4.3.0/sid/debian/changelog	2003-11-15 09:04:26 UTC (rev 771)
@@ -2449,13 +2449,13 @@
     + 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
+    + Fixed GetTimeInMillis() to use deltas instead of absolute time returned
       by gettimeofday(). This ensures time is monotonic in X (Egbert Eich).
       (Closes: #85365)
     + Sync with Type1 font rasterizer from HEAD:
@@ -4904,6 +4904,3 @@
   $Id$
 
   vim:set ai et sts=2 sw=2 tw=78:
-<<<<<<< .mine
-=======
->>>>>>> .r769



Reply to: