diff options
| author | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
| commit | eed18bf1fd1162872e196091ab795a773f277e8e (patch) | |
| tree | f3fee81f1e7fdf23b57138740437e07ce244ede8 /doc/misc | |
| parent | 8a85c254de2528be0f3ff154fa24df65e6557c1a (diff) | |
| parent | 1fc82d89a8a603754d17a35be1ce78e66d0b6fd6 (diff) | |
| download | emacs-eed18bf1fd1162872e196091ab795a773f277e8e.tar.gz emacs-eed18bf1fd1162872e196091ab795a773f277e8e.zip | |
Merge from emacs-24
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 804e52dc27c..a8fccd391d8 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -57,8 +57,8 @@ | |||
| 57 | 2014-09-24 Ulf Jasper <ulf.jasper@web.de> | 57 | 2014-09-24 Ulf Jasper <ulf.jasper@web.de> |
| 58 | 58 | ||
| 59 | * newsticker.texi: Reworked. Document new treeview group | 59 | * newsticker.texi: Reworked. Document new treeview group |
| 60 | commands. Remove VERSION, UPDATED, use EMACSVER instead. Use | 60 | commands. Remove VERSION, UPDATED, use EMACSVER instead. |
| 61 | term 'feed reader'. | 61 | Use term 'feed reader'. |
| 62 | 62 | ||
| 63 | 2014-09-04 Paul Eggert <eggert@cs.ucla.edu> | 63 | 2014-09-04 Paul Eggert <eggert@cs.ucla.edu> |
| 64 | 64 | ||