diff options
| author | Paul Eggert | 2011-05-27 12:56:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-27 12:56:58 -0700 |
| commit | be7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023 (patch) | |
| tree | fc51501aa66ecdffb95b8a71edf204bdf6515b03 /src/ChangeLog | |
| parent | 9d34ec3e75704342c2875907d6676e1c5e5b5389 (diff) | |
| parent | 18480f8fc0b4bbd2af93db1d6a566c2a3c1d1959 (diff) | |
| download | emacs-be7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023.tar.gz emacs-be7b2f3e8f9a5438d38a5d42d4b1ee0eecacd023.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d45543c8d36..de7b3506abc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-05-27 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup. | ||
| 4 | |||
| 1 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2011-05-27 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Integer overflow fixes. | 7 | Integer overflow fixes. |