aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorKaroly Lorentey2006-04-28 14:48:18 +0000
committerKaroly Lorentey2006-04-28 14:48:18 +0000
commitb33c71f58623306001d4d4fe4f7354d8c360edaa (patch)
tree3bcc8154133fcb19081850754bb725f38f86b56f /admin
parent717a00ef34c0f55bfbad80584f00d86c090d547f (diff)
parenta48b489eb94a238c1eca6a0c4bdf7d5b80503240 (diff)
downloademacs-b33c71f58623306001d4d4fe4f7354d8c360edaa.tar.gz
emacs-b33c71f58623306001d4d4fe4f7354d8c360edaa.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-234 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-235 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-236 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-237 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-238 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-239 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-240 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-241 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-242 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-243 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-244 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-245 (Ffield_beginning, find_field): Undo change of 2006-04-23. * emacs@sv.gnu.org/emacs--devo--0--patch-246 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-247 Rcirc patch from Ryan Yeske * emacs@sv.gnu.org/emacs--devo--0--patch-248 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-249 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-250 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-251 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-87 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-88 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-89 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-90 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-91 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-92 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-93 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-94 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-95 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/alloc-colors.c2
-rwxr-xr-xadmin/build-configs2
-rw-r--r--admin/cus-test.el2
-rwxr-xr-xadmin/diff-tar-files2
-rwxr-xr-xadmin/make-emacs2
-rwxr-xr-xadmin/revdiff2
7 files changed, 10 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8256beefb6c..9dc0def4788 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12006-04-17 Ramprasad B <ramprasad_i82@yahoo.com>
2
3 * ./* (Copyright): Updated Copyright year(s)
4
12006-02-24 Reiner Steib <Reiner.Steib@gmx.de> 52006-02-24 Reiner Steib <Reiner.Steib@gmx.de>
2 6
3 * FOR-RELEASE (BUGS): Add URLs/MIDs. 7 * FOR-RELEASE (BUGS): Add URLs/MIDs.
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 361b3bd2f24..947b542005c 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,5 +1,5 @@
1/* Allocate X colors. Used for testing with dense colormaps. 1/* Allocate X colors. Used for testing with dense colormaps.
2 Copyright (C) 2001 Free Software Foundation, Inc. 2 Copyright (C) 2001, 2006 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
diff --git a/admin/build-configs b/admin/build-configs
index 083c9e766e6..29fc0f0b94c 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,6 +1,6 @@
1#! /usr/bin/perl 1#! /usr/bin/perl
2 2
3# Copyright (C) 2001 Free Software Foundation, Inc. 3# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
4# 4#
5# This file is part of GNU Emacs. 5# This file is part of GNU Emacs.
6# 6#
diff --git a/admin/cus-test.el b/admin/cus-test.el
index ff38b0b08ff..6ff92b88c95 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
1;;; cus-test.el --- tests for custom types and load problems 1;;; cus-test.el --- tests for custom types and load problems
2 2
3;; Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 2000, 2002, 2006 Free Software Foundation, Inc.
4 4
5;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de> 5;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
6;; Maintainer: Markus Rost <rost@math.ohio-state.edu> 6;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 7f27ab99876..da3b1911abb 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# Copyright (C) 2001 Free Software Foundation, Inc. 3# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
4# 4#
5# This file is part of GNU Emacs. 5# This file is part of GNU Emacs.
6# 6#
diff --git a/admin/make-emacs b/admin/make-emacs
index d17e59e5692..57d04a8f625 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,6 +1,6 @@
1#! /usr/bin/perl 1#! /usr/bin/perl
2 2
3# Copyright (C) 2001 Free Software Foundation, Inc. 3# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
4# 4#
5# This file is part of GNU Emacs. 5# This file is part of GNU Emacs.
6# 6#
diff --git a/admin/revdiff b/admin/revdiff
index d936106aada..3b5ffaad3f1 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,6 +1,6 @@
1#! /usr/bin/perl 1#! /usr/bin/perl
2 2
3# Copyright (C) 2001 Free Software Foundation, Inc. 3# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
4# 4#
5# This file is part of GNU Emacs. 5# This file is part of GNU Emacs.
6# 6#