aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2014-01-13 08:26:08 +0900
committerKenichi Handa2014-01-13 08:26:08 +0900
commit1a0778b078b9ffaa68e1ae0d4b26de147872b421 (patch)
tree993d3a684b6c08a7cdd98fd8827ddd058931ebc9 /ChangeLog
parent67671fb1dcbfd46ddee7e753d6f545d25821d445 (diff)
parentb30dee657df010645703150248a33f3e22a002d2 (diff)
downloademacs-1a0778b078b9ffaa68e1ae0d4b26de147872b421.tar.gz
emacs-1a0778b078b9ffaa68e1ae0d4b26de147872b421.zip
merge trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 2 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d220f2254ea..52519f3382c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
12014-01-11 Eric S. Raymond <esr@thyrsus.com> 12014-01-12 Glenn Morris <rgm@gnu.org>
2 2
3 * celibacy.1, sex.6, condom.1, echo.msg: Deleted at RMS's 3 * README: Replace reference to etc/MAILINGLISTS.
4 suggestion. Not lost to posterity as they are part of the
5 widely distributed funny-manpages collection.
6 4
72014-01-11 Fabrice Popineau <fabrice.popineau@gmail.com> 52014-01-11 Fabrice Popineau <fabrice.popineau@gmail.com>
8 6