diff options
| author | Joakim Verona | 2013-08-14 06:41:21 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 06:41:21 +0200 |
| commit | ce7942f31ff4f4902ef2648020f2b96047b68cda (patch) | |
| tree | 3ff00d16fc12763746148ce38a6a7949336e42da /src/ChangeLog | |
| parent | 77df9fad7b2d502eb6f50752b57f6797296fa72a (diff) | |
| parent | da5707e8ec8df0a8a9bb1a1f12c6b701314845cc (diff) | |
| download | emacs-ce7942f31ff4f4902ef2648020f2b96047b68cda.tar.gz emacs-ce7942f31ff4f4902ef2648020f2b96047b68cda.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index af088340e3b..cf73204c55c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> | 1 | 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 2 | ||
| 3 | Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit. | ||
| 4 | * image.c (imagemagick_filename_hint): Use `const char *' and | ||
| 5 | prefer SSDATA to SDATA to avoid warnings. | ||
| 6 | |||
| 7 | 2013-08-14 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 8 | |||
| 3 | Cleanup window fringes, margins and scroll bars adjustments. | 9 | Cleanup window fringes, margins and scroll bars adjustments. |
| 4 | * window.c (set_window_fringes, set_window_margins) | 10 | * window.c (set_window_fringes, set_window_margins) |
| 5 | (set_window_scroll_bars, apply_window_adjustment): New functions. | 11 | (set_window_scroll_bars, apply_window_adjustment): New functions. |