diff options
| author | Jan Djärv | 2014-11-09 11:23:46 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-11-09 11:23:46 +0100 |
| commit | 1af3b1135a6583de83c83d4d9fdcfb24f0b7335b (patch) | |
| tree | 1596da8844693b6b91c5cec53f771d11fe30af93 /src/ChangeLog | |
| parent | 57db3f3adc251b628c5aea7e513a66f9305fdd4b (diff) | |
| download | emacs-1af3b1135a6583de83c83d4d9fdcfb24f0b7335b.tar.gz emacs-1af3b1135a6583de83c83d4d9fdcfb24f0b7335b.zip | |
Clean up merge error.
* nsterm.m (ns_set_vertical_scroll_bar)
(ns_set_horizontal_scroll_bar): Cleanup merge error.
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 2ef9c6ba9aa..36f4dbdac66 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-09 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (ns_set_vertical_scroll_bar) | ||
| 4 | (ns_set_horizontal_scroll_bar): Cleanup merge error. | ||
| 5 | |||
| 1 | 2014-11-09 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-11-09 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * xgselect.c (xg_select): Don't assume n_gfds is nonnegative | 8 | * xgselect.c (xg_select): Don't assume n_gfds is nonnegative |