Fix order of ChangeLog entries after merge.

2ff916cb · Paul Eggert · be7b2f3e · 2ff916cb
Commit 2ff916cb authored May 27, 2011 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/ChangeLog src/ChangeLog +4 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
-2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
-
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

 	Integer overflow fixes.
@@ -84,6 +80,10 @@
 	a character than a buffer op, so better that it's in character.c.
 	* fns.c, print.c: Adjust to above changes.

+2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
+
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

 	* xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.