diff options
| author | Joakim Verona | 2013-08-19 08:01:26 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-19 08:01:26 +0200 |
| commit | e86a500d430c41e7fd8c7412c3a638154186b83b (patch) | |
| tree | a6fa83bb42e0b1c83b971870ff02cf790bd5f63a /src/ChangeLog | |
| parent | 433fc48f7db05643b7bab35e147ac2bc62713859 (diff) | |
| parent | 2249012558e589b9382e068326116dbd909bbb81 (diff) | |
| download | emacs-e86a500d430c41e7fd8c7412c3a638154186b83b.tar.gz emacs-e86a500d430c41e7fd8c7412c3a638154186b83b.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0f68f36a8c9..0203ce636ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-19 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * process.c (handle_child_signal): Fix crash; deleted pid (Bug#15106). | ||
| 4 | This was introduced by my 2013-08-12 fix for Bug#15035. | ||
| 5 | |||
| 1 | 2013-08-19 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-08-19 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) | 8 | * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) |