diff options
| author | Jan Djärv | 2014-11-08 09:47:45 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-11-08 09:47:45 +0100 |
| commit | a05fd1fc7813611575cad6890a45b5fd7eba8e67 (patch) | |
| tree | 851ee581a3331b7bb71f72cd05179b27018b018c /src/ChangeLog | |
| parent | 2b513c3b1c67e16813118f7682cc088ecd070e07 (diff) | |
| download | emacs-a05fd1fc7813611575cad6890a45b5fd7eba8e67.tar.gz emacs-a05fd1fc7813611575cad6890a45b5fd7eba8e67.zip | |
* nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
cleanup from 2014-11-01.
Fixes: debbugs:18972
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 a2a4e9dccaf..4700e314a16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-08 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge | ||
| 4 | cleanup from 2014-11-01 (Bug#18972). | ||
| 5 | |||
| 1 | 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * keyboard.c: Call gui-set-selection instead of x-set-selection. | 8 | * keyboard.c: Call gui-set-selection instead of x-set-selection. |