aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2015-02-01 17:08:51 -0800
committerGlenn Morris2015-02-01 17:08:51 -0800
commit9e22ff02ed9e0e448ee372cadbcecbc3e7d2dad8 (patch)
treec8028e8a832c9810103b8d1782315d31ddb2923f /admin
parentd3852a99c99f0785425a3a4c9d48d31e9aeec7c9 (diff)
downloademacs-9e22ff02ed9e0e448ee372cadbcecbc3e7d2dad8.tar.gz
emacs-9e22ff02ed9e0e448ee372cadbcecbc3e7d2dad8.zip
# ChangeLog fixes, backported
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog13
1 files changed, 7 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index f5490013544..88d996532e0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -19,7 +19,7 @@
19 19
202014-11-17 Oscar Fuentes <ofv@wanadoo.es> 202014-11-17 Oscar Fuentes <ofv@wanadoo.es>
21 21
22 * admin/CPP-DEFINES: Mention MINGW_W64. 22 * CPP-DEFINES: Mention MINGW_W64.
23 23
242014-11-15 Glenn Morris <rgm@gnu.org> 242014-11-15 Glenn Morris <rgm@gnu.org>
25 25
@@ -29,9 +29,10 @@
29 29
302014-11-11 Eric S. Raymond <esr@thyrsus.com> 302014-11-11 Eric S. Raymond <esr@thyrsus.com>
31 31
32 * make-tarball.txt, update-copyright, admin/notes/bugtracker, 32 * make-tarball.txt, notes/bugtracker, notes/repo, notes/tags:
33 admin/notes/tags, admin/update-copyright, admin/update_autogen: 33 Git transition.
34 admin/repo.notes: git transition. 34 * update-copyright: Use git ls-files.
35 * update_autogen: Remove some bzr conditionals.
35 36
362014-11-09 Eli Zaretskii <eliz@gnu.org> 372014-11-09 Eli Zaretskii <eliz@gnu.org>
37 38
@@ -52,8 +53,8 @@
52 53
532014-10-31 Eric S. Raymond <esr@thyrsus.com> 542014-10-31 Eric S. Raymond <esr@thyrsus.com>
54 55
55 * notes/bzr: Renamed to notes/repo, reorganized to separate 56 * notes/bzr: Rename to notes/repo, reorganize to separate
56 VCS-dependent from VCS-independent stuff. Added guidance about 57 VCS-dependent from VCS-independent stuff. Add guidance about
57 commit-comment format under DVCSes. 58 commit-comment format under DVCSes.
58 59
59 * notes/BRANCH: Merged into notes/repo. 60 * notes/BRANCH: Merged into notes/repo.