aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-09-11 16:17:49 +0200
committerJoakim Verona2013-09-11 16:17:49 +0200
commite9d8fea04e2d22ba8c6b238444f04d654492fa76 (patch)
tree5cc927f1780543c5848c88af7896703e404df0b0 /src/ChangeLog
parent6070fc71f3af2a40bc3402ac387665fa713fa8e5 (diff)
parent412a09723c5cf5f8b8a28fc0ef104750de3a6d7f (diff)
downloademacs-e9d8fea04e2d22ba8c6b238444f04d654492fa76.tar.gz
emacs-e9d8fea04e2d22ba8c6b238444f04d654492fa76.zip
merge from trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 41e20465d57..dda202af89f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12013-09-11 Dmitry Antipov <dmantipov@yandex.ru> 12013-09-11 Dmitry Antipov <dmantipov@yandex.ru>
2 2
3 * termhooks.h (fullscreen_hook): Remove the leftover.
4 (struct terminal): Fix typo in comment.
5
62013-09-11 Dmitry Antipov <dmantipov@yandex.ru>
7
3 Cleaning up a few X scroll bar bits. 8 Cleaning up a few X scroll bar bits.
4 * termhooks.h (enum scroll_bar_part): Add scroll_bar_nowhere member. 9 * termhooks.h (enum scroll_bar_part): Add scroll_bar_nowhere member.
5 * xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS && USE_LUCID]: 10 * xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS && USE_LUCID]: