diff options
| author | Paul Eggert | 2011-05-27 12:58:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-27 12:58:54 -0700 |
| commit | 2ff916cbc27dc7c242ff97d31419866d41f62e2c (patch) | |
| tree | 24716e35435a8638b8a6228266e057a917f15cca /src | |
| parent | be7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023 (diff) | |
| download | emacs-2ff916cbc27dc7c242ff97d31419866d41f62e2c.tar.gz emacs-2ff916cbc27dc7c242ff97d31419866d41f62e2c.zip | |
Fix order of ChangeLog entries after merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 |
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 @@ | |||
| 1 | 2011-05-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. | ||
| 4 | |||
| 5 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> |
| 6 | 2 | ||
| 7 | Integer overflow fixes. | 3 | Integer overflow fixes. |
| @@ -84,6 +80,10 @@ | |||
| 84 | a character than a buffer op, so better that it's in character.c. | 80 | a character than a buffer op, so better that it's in character.c. |
| 85 | * fns.c, print.c: Adjust to above changes. | 81 | * fns.c, print.c: Adjust to above changes. |
| 86 | 82 | ||
| 83 | 2011-05-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 84 | |||
| 85 | * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. | ||
| 86 | |||
| 87 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> | 87 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> |
| 88 | 88 | ||
| 89 | * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings. | 89 | * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings. |