diff options
| author | Joakim Verona | 2013-08-14 16:07:18 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-14 16:07:18 +0200 |
| commit | ef7cb56e57e53af78783a85df167f943bd5fe039 (patch) | |
| tree | 8f3bfe3c46095a6c4b0c3e674cb3438ab060862c /src/ChangeLog | |
| parent | 55497105a66ffe094014399687a18153619f08ed (diff) | |
| parent | d48d97ee4ab07e0c3e8c1a63efcfb707eef1b352 (diff) | |
| download | emacs-ef7cb56e57e53af78783a85df167f943bd5fe039.tar.gz emacs-ef7cb56e57e53af78783a85df167f943bd5fe039.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 548ae5ab2c0..8a3186b85f2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,6 +6,10 @@ | |||
| 6 | 6 | ||
| 7 | * decompress.c (unwind_decompress): Always restore point. | 7 | * decompress.c (unwind_decompress): Always restore point. |
| 8 | 8 | ||
| 9 | 2013-08-14 Xue Fuqiao <xfq.free@gmail.com> | ||
| 10 | |||
| 11 | * marker.c (set_marker): Reformat documentation. | ||
| 12 | |||
| 9 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> | 13 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> |
| 10 | 14 | ||
| 11 | * xdisp.c (cursor_type_changed): Now static. | 15 | * xdisp.c (cursor_type_changed): Now static. |