aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-10-31 11:09:24 +0200
committerEli Zaretskii2014-10-31 11:09:24 +0200
commit15d0d8d11bb015f76e83f8d43da7622eff12ff95 (patch)
treee8c3a2939a82caa84eb50cced0745659cd57c23b /lisp/ChangeLog
parent1ad9ad3bfe59e781ab7dd4b340c1dad9ef94d9ae (diff)
downloademacs-15d0d8d11bb015f76e83f8d43da7622eff12ff95.tar.gz
emacs-15d0d8d11bb015f76e83f8d43da7622eff12ff95.zip
Yet another change for git migration backported from trunk.
lisp/version.el (emacs-bzr-version, emacs-bzr-get-version): Revert 2014-10-31 change.
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index daba07c3c9e..dc5fae78970 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-10-31 Glenn Morris <rgm@gnu.org>
2
3 * version.el (emacs-bzr-version, emacs-bzr-get-version):
4 Revert 2014-10-31 change.
5
12014-10-31 Eric S. Raymond <esr@thyrsus.com> 62014-10-31 Eric S. Raymond <esr@thyrsus.com>
2 7
3 * version.el: Fix some fallback values to conform to the actual 8 * version.el: Fix some fallback values to conform to the actual