summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-05-27 12:58:54 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-05-27 12:58:54 -0700
commit2ff916cbc27dc7c242ff97d31419866d41f62e2c (patch)
tree24716e35435a8638b8a6228266e057a917f15cca /src
parentbe7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023 (diff)
Fix order of ChangeLog entries after merge.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index de7b3506abc..55ee4815149 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,3 @@
-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.