diff options
| author | Glenn Morris | 2014-11-29 13:25:50 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-29 13:25:50 -0800 |
| commit | aa1459ae2a2d578455a3da911732fceaeeb5d23e (patch) | |
| tree | e7e4ac0188fce4bcdb357937f074e43bc23614cf /admin | |
| parent | 287740d6ed8135702d34133dbf01c4387bc145dc (diff) | |
| download | emacs-aa1459ae2a2d578455a3da911732fceaeeb5d23e.tar.gz emacs-aa1459ae2a2d578455a3da911732fceaeeb5d23e.zip | |
Fix up merged ChangeLog entries (dates, duplication, etc)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index d894f768fcd..70961a727a6 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * gitmerge.el: New file. | 13 | * gitmerge.el: New file. |
| 14 | * notes/git-workflow: Add documentation for using it. | 14 | * notes/git-workflow: Add documentation for using it. |
| 15 | 15 | ||
| 16 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> | 16 | 2014-11-27 Oscar Fuentes <ofv@wanadoo.es> |
| 17 | 17 | ||
| 18 | * admin/CPP-DEFINES: Mention MINGW_W64. | 18 | * admin/CPP-DEFINES: Mention MINGW_W64. |
| 19 | 19 | ||
| @@ -22,12 +22,6 @@ | |||
| 22 | * admin.el (set-version): No more need to update nt/*.rc. | 22 | * admin.el (set-version): No more need to update nt/*.rc. |
| 23 | * authors.el (authors-renamed-files-alist): Add .rc.in files. | 23 | * authors.el (authors-renamed-files-alist): Add .rc.in files. |
| 24 | 24 | ||
| 25 | 2014-11-16 Glenn Morris <rgm@gnu.org> | ||
| 26 | |||
| 27 | * update_autogen: Auto-detect VCS in use. | ||
| 28 | (vcs): New variable. | ||
| 29 | (status, commit, main): Handle git. | ||
| 30 | |||
| 31 | 2014-11-13 Andreas Schwab <schwab@suse.de> | 25 | 2014-11-13 Andreas Schwab <schwab@suse.de> |
| 32 | 26 | ||
| 33 | * make-tarball.txt: Make annotated tag and push it out. | 27 | * make-tarball.txt: Make annotated tag and push it out. |