aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2006-04-02 01:10:03 +0000
committerMiles Bader2006-04-02 01:10:03 +0000
commite6335dc16c9c8fad7dc630e9a8261e4178d8e2fa (patch)
tree176c338a29f14341f266ef50f2a211fa13082575 /src
parent91b7e4a6fdd600278a3dd3fd5a7962ef0c2a9b72 (diff)
parent5af68e282f359dbe09565f690d3f6920a593fb0e (diff)
downloademacs-e6335dc16c9c8fad7dc630e9a8261e4178d8e2fa.tar.gz
emacs-e6335dc16c9c8fad7dc630e9a8261e4178d8e2fa.zip
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-51
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 188-189) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 73) - Update from CVS
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/config.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2c048043058..3c309679cdb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-04-01 Eli Zaretskii <eliz@gnu.org>
2
3 * configure: Regenerated.
4
12006-03-31 Kenichi Handa <handa@m17n.org> 52006-03-31 Kenichi Handa <handa@m17n.org>
2 6
3 * xfns.c (xg_set_icon): Delete superfluous UNGCPRO. 7 * xfns.c (xg_set_icon): Delete superfluous UNGCPRO.
diff --git a/src/config.in b/src/config.in
index 11b842c3d00..2bc4ba56e79 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,8 +1,8 @@
1/* src/config.in. Generated from configure.in by autoheader. */ 1/* src/config.in. Generated from configure.in by autoheader. */
2 2
3/* GNU Emacs site configuration template file. 3/* GNU Emacs site configuration template file.
4 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 4 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006
5 2006 Free Software Foundation, Inc. 5 Free Software Foundation, Inc.
6 6
7This file is part of GNU Emacs. 7This file is part of GNU Emacs.
8 8