diff options
| author | Joakim Verona | 2013-09-11 12:31:33 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 12:31:33 +0200 |
| commit | 41390a42c5c18af8a112d7481875fe25e42b659c (patch) | |
| tree | 79ec26d3af83b103bd24ba985f785d29ffa376cf /src/ChangeLog | |
| parent | d1ae916c78cf224dd9b107b42d1258db7b096c11 (diff) | |
| parent | f5dacaaec042fe230859469ebd5e307f78448ac4 (diff) | |
| download | emacs-41390a42c5c18af8a112d7481875fe25e42b659c.tar.gz emacs-41390a42c5c18af8a112d7481875fe25e42b659c.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 83e5dbcdaff..6e527b996dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-09-11 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * xdisp.c (Ftool_bar_lines_needed): Declare as 'const' if ifdeffed out, | ||
| 4 | avoiding a GCC warning. | ||
| 5 | |||
| 1 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-09-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Ifdef away frame tool bar code when it is not really used. | 8 | Ifdef away frame tool bar code when it is not really used. |