diff options
| author | Joakim Verona | 2013-08-13 22:26:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 22:26:49 +0200 |
| commit | f2e32ba803f53e08cc65f75d51a4a8c3e01357b3 (patch) | |
| tree | 0153f18db8433eed5cb8b159171da2887d9331e3 /src/ChangeLog | |
| parent | 527a4d099e6ad4a5615c28c3071757ad3a0dbf9a (diff) | |
| parent | a5bd5abb645ea5c0e5bb45425128166af44dc237 (diff) | |
| download | emacs-f2e32ba803f53e08cc65f75d51a4a8c3e01357b3.tar.gz emacs-f2e32ba803f53e08cc65f75d51a4a8c3e01357b3.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 af76a0c3780..0c0583684dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsmenu.m (x_activate_menubar): Check for OSX >= 10.5 | ||
| 4 | (trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5. | ||
| 5 | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * image.c (imagemagick_filename_hint): Check for errors in the | 8 | * image.c (imagemagick_filename_hint): Check for errors in the |