aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-11-01 11:05:30 -0700
committerGlenn Morris2014-11-01 11:05:30 -0700
commitd5d8ca30e5f481a32414c42bcc3b5a042061ff07 (patch)
treefebc223f19801e8e01b9498c5ba9d6c7bfcfa091 /admin/ChangeLog
parente54c5e4e25098be9df9d9c46d32165887b0ff9d3 (diff)
parentb99e8f833671a2b52be654eb477830294c624a97 (diff)
downloademacs-d5d8ca30e5f481a32414c42bcc3b5a042061ff07.tar.gz
emacs-d5d8ca30e5f481a32414c42bcc3b5a042061ff07.zip
Merge from emacs-24; up to 117656
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog10
1 files changed, 8 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6bd5ceaca55..5dcdc563e56 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,13 @@
12014-11-01 Eli Zaretskii <eliz@gnu.org>
2
3 * notes/repo (Notes): Reword the stylistic guidance for commit log
4 messages so that they are in line with Emacs development practices
5 and style guidance.
6
12014-10-27 Eric S. Raymond <esr@thyrsus.com> 72014-10-27 Eric S. Raymond <esr@thyrsus.com>
2 8
3 * notes/bzr: Renamed to notes/repo, reorganixed to separate 9 * notes/bzr: Rename to notes/repo, reorganize to separate
4 VCS-dependent from VCS-independent stuff. Added guidance about 10 VCS-dependent from VCS-independent stuff. Add guidance about
5 commit-comment format under DVCSes. 11 commit-comment format under DVCSes.
6 12
7 * notes/BRANCH: Merged into notes/repo. 13 * notes/BRANCH: Merged into notes/repo.