summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-11-29 13:25:50 -0800
committerGlenn Morris <rgm@gnu.org>2014-11-29 13:25:50 -0800
commitaa1459ae2a2d578455a3da911732fceaeeb5d23e (patch)
treee7e4ac0188fce4bcdb357937f074e43bc23614cf /admin
parent287740d6ed8135702d34133dbf01c4387bc145dc (diff)
downloademacs-aa1459ae2a2d578455a3da911732fceaeeb5d23e.tar.gz
Fix up merged ChangeLog entries (dates, duplication, etc)
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog8
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 @@
* gitmerge.el: New file.
* notes/git-workflow: Add documentation for using it.
-2014-11-17 Oscar Fuentes <ofv@wanadoo.es>
+2014-11-27 Oscar Fuentes <ofv@wanadoo.es>
* admin/CPP-DEFINES: Mention MINGW_W64.
@@ -22,12 +22,6 @@
* admin.el (set-version): No more need to update nt/*.rc.
* authors.el (authors-renamed-files-alist): Add .rc.in files.
-2014-11-16 Glenn Morris <rgm@gnu.org>
-
- * update_autogen: Auto-detect VCS in use.
- (vcs): New variable.
- (status, commit, main): Handle git.
-
2014-11-13 Andreas Schwab <schwab@suse.de>
* make-tarball.txt: Make annotated tag and push it out.