diff options
| author | Chong Yidong | 2012-06-17 13:13:40 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-17 13:13:40 +0800 |
| commit | 41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821 (patch) | |
| tree | 83b5228b63fe4bf45ec71aa25b5a21ab6aff3676 /src/ChangeLog | |
| parent | 82a25657c58b7a5ad2f6d247aa91e11f0b2a783b (diff) | |
| parent | 05c44a7512ba0da34f7e6c3869c22f2f3517d255 (diff) | |
| download | emacs-41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821.tar.gz emacs-41b7f8bc6c4511ab6fcf7f6b1f9e7fdcd8592821.zip | |
Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org
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 d392dd522b3..8baeeadc2d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-06-17 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't | ||
| 4 | referenced (Bug#11583). | ||
| 5 | |||
| 1 | 2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> | 6 | 2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> |
| 2 | 7 | ||
| 3 | Implement wave-style variant of underlining. | 8 | Implement wave-style variant of underlining. |