diff options
| author | Paul Eggert | 2015-03-03 14:21:26 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-03-03 14:21:26 -0800 |
| commit | 9792a944dcf08a246bf2618b2a5bee906a888069 (patch) | |
| tree | 495e6fbc120a10c383e5572b5e9b879f74cbb71e /admin/ChangeLog | |
| parent | 8b990b89011d5b954c794e08549776b15e34fff1 (diff) | |
| parent | d3852a99c99f0785425a3a4c9d48d31e9aeec7c9 (diff) | |
| download | emacs-9792a944dcf08a246bf2618b2a5bee906a888069.tar.gz emacs-9792a944dcf08a246bf2618b2a5bee906a888069.zip | |
Merge from origin/emacs-24
d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.
Conflicts:
admin/ChangeLog
lisp/ChangeLog
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ec500569860..9a160446b35 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-03-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address | ||
| 4 | rather than webmasters@gnu. | ||
| 5 | |||
| 1 | 2015-01-28 Glenn Morris <rgm@gnu.org> | 6 | 2015-01-28 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * update_autogen (commit): Prepend "# " to commit message. | 8 | * update_autogen (commit): Prepend "# " to commit message. |