aboutsummaryrefslogtreecommitdiffstats
path: root/lispref
diff options
context:
space:
mode:
authorGlenn Morris2007-08-27 07:38:26 +0000
committerGlenn Morris2007-08-27 07:38:26 +0000
commitb8f06a437313dff7fcedd9302d781564d78c95e8 (patch)
tree5c23542d871c37e8c1c27870c1759f50beaa3372 /lispref
parent66495ac6d982dcb69a56da8fc680729660470341 (diff)
downloademacs-b8f06a437313dff7fcedd9302d781564d78c95e8.tar.gz
emacs-b8f06a437313dff7fcedd9302d781564d78c95e8.zip
Reset dates pending merge to trunk. Dates to be replaced with merge
date.
Diffstat (limited to 'lispref')
-rw-r--r--lispref/ChangeLog.multi-tty4
1 files changed, 2 insertions, 2 deletions
diff --git a/lispref/ChangeLog.multi-tty b/lispref/ChangeLog.multi-tty
index b29473e60e5..9180c5310a8 100644
--- a/lispref/ChangeLog.multi-tty
+++ b/lispref/ChangeLog.multi-tty
@@ -1,4 +1,4 @@
12007-07-02 Dan Nicolaescu <dann@ics.uci.edu> 10000-00-00 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * frames.texi (Basic Parameters): Add display-environment-variable 3 * frames.texi (Basic Parameters): Add display-environment-variable
4 and term-environment-variable. 4 and term-environment-variable.
@@ -7,7 +7,7 @@
7;; coding: iso-2022-7bit 7;; coding: iso-2022-7bit
8;; add-log-time-zone-rule: t 8;; add-log-time-zone-rule: t
9;; End: 9;; End:
10 10
11 Copyright (C) 2007 Free Software Foundation, Inc. 11 Copyright (C) 2007 Free Software Foundation, Inc.
12 12
13 This file is part of GNU Emacs. 13 This file is part of GNU Emacs.