diff options
| author | Fabián Ezequiel Gallina | 2014-12-27 14:15:05 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-12-27 14:35:26 -0300 |
| commit | 848343f3467fdb14d407865babb9c71683128618 (patch) | |
| tree | ea82ccfc5ec3cd74898841502ca8a4c0c522d95d /src | |
| parent | 35e1f9d9fcbaab51808e05f514e63927f959ae51 (diff) | |
| download | emacs-848343f3467fdb14d407865babb9c71683128618.tar.gz emacs-848343f3467fdb14d407865babb9c71683128618.zip | |
Sanitize ChangeLog entries for previous merges.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d9408bf468..c32b1209ae7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | set (Bug#19133). | 19 | set (Bug#19133). |
| 20 | (setPixmapData): Rename local variable bmRep to avoid compiler | 20 | (setPixmapData): Rename local variable bmRep to avoid compiler |
| 21 | warning. | 21 | warning. |
| 22 | |||
| 22 | 2014-12-27 Jan Djärv <jan.h.d@swipnet.se> | 23 | 2014-12-27 Jan Djärv <jan.h.d@swipnet.se> |
| 23 | 24 | ||
| 24 | * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert | 25 | * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert |