diff options
| author | Paul Eggert | 2014-11-28 22:55:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-28 23:07:16 -0800 |
| commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
| tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /admin/ChangeLog | |
| parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
| download | emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz emacs-0cce3623b169732a51f055a86fc926313b11a5ee.zip | |
Merge branch 'emacs-24'.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 84aea47ae9e..d894f768fcd 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-11-29 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Lessen focus on ChangeLog files, as opposed to change log entries. | ||
| 4 | This is in preparation for generating the former automatically | ||
| 5 | from the latter. | ||
| 6 | * notes/bugtracker, notes/copyright, notes/newfile: | ||
| 7 | ChangeLog -> change log | ||
| 8 | * notes/changelogs: Remove, merging old contents to ... | ||
| 9 | * notes/repo: ... here. | ||
| 10 | |||
| 1 | 2014-11-27 David Engster <deng@randomsample.de> | 11 | 2014-11-27 David Engster <deng@randomsample.de> |
| 2 | 12 | ||
| 3 | * gitmerge.el: New file. | 13 | * gitmerge.el: New file. |