diff options
| author | Joakim Verona | 2013-09-14 11:40:24 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-14 11:40:24 +0200 |
| commit | 2b483f0f59ff7f125dfbe490e42eb84c238ac971 (patch) | |
| tree | ba1528a35fc63b414fe981fe335b053beec4bfe3 /src/ChangeLog | |
| parent | 9523ac3289ca64bd74c42a1cc20ed1df7a9896e7 (diff) | |
| parent | 08a209bff2e8f91720e5b2dfbac071ea2286814b (diff) | |
| download | emacs-2b483f0f59ff7f125dfbe490e42eb84c238ac971.tar.gz emacs-2b483f0f59ff7f125dfbe490e42eb84c238ac971.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 cc8704da2a1..00f3fa8eccf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-09-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>: | ||
| 4 | Doc fix. (Bug#15375) | ||
| 5 | |||
| 1 | 2013-09-13 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-09-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Unify Fx_focus_frame between all ports. | 8 | Unify Fx_focus_frame between all ports. |