diff options
| author | Karoly Lorentey | 2006-02-06 18:44:57 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-02-06 18:44:57 +0000 |
| commit | a5805c9d0240fab504f2a3e32db6449392005fb6 (patch) | |
| tree | a6eba3e018d5edf0f33476dcf5d2f2ac50983307 /lwlib | |
| parent | fbb63435176d3614d3603b675784122bf50d22b1 (diff) | |
| parent | 55495ab90ed2afd64f757e55f697d716a7c7b75c (diff) | |
| download | emacs-a5805c9d0240fab504f2a3e32db6449392005fb6.tar.gz emacs-a5805c9d0240fab504f2a3e32db6449392005fb6.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-41
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-42
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-43
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-44
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-45
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-46
Merge from erc--emacs--0
* emacs@sv.gnu.org/emacs--devo--0--patch-47
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-48
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-14
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-15
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-16
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-17
Merge from emacs--devo--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xlw.c | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.c | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.h | 2 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 | ||||
| -rw-r--r-- | lwlib/xlwmenu.h | 3 | ||||
| -rw-r--r-- | lwlib/xlwmenuP.h | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index de7c73e0d05..0bd79a323c7 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1298,7 +1298,7 @@ | |||
| 1298 | ;; coding: iso-2022-7bit-unix | 1298 | ;; coding: iso-2022-7bit-unix |
| 1299 | ;; End: | 1299 | ;; End: |
| 1300 | 1300 | ||
| 1301 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002 | 1301 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2006 |
| 1302 | Free Software Foundation, Inc. | 1302 | Free Software Foundation, Inc. |
| 1303 | Copying and distribution of this file, with or without modification, | 1303 | Copying and distribution of this file, with or without modification, |
| 1304 | are permitted provided the copyright notice and this notice are preserved. | 1304 | are permitted provided the copyright notice and this notice are preserved. |
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index 40091e7b69b..4799b1dbd9d 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* The lwlib interface to "xlwmenu" menus. | 1 | /* The lwlib interface to "xlwmenu" menus. |
| 2 | Copyright (C) 1992 Lucid, Inc. | 2 | Copyright (C) 1992 Lucid, Inc. |
| 3 | Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, | 3 | Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, |
| 4 | 2005 Free Software Foundation, Inc. | 4 | 2005, 2006 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of the Lucid Widget Library. | 6 | This file is part of the Lucid Widget Library. |
| 7 | 7 | ||
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 32abbca7601..78ad165ef0e 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* The lwlib interface to Motif widgets. | 1 | /* The lwlib interface to Motif widgets. |
| 2 | Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, | 2 | Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, |
| 3 | 2004, 2005 Free Software Foundation, Inc. | 3 | 2004, 2005, 2006 Free Software Foundation, Inc. |
| 4 | Copyright (C) 1992 Lucid, Inc. | 4 | Copyright (C) 1992 Lucid, Inc. |
| 5 | 5 | ||
| 6 | This file is part of the Lucid Widget Library. | 6 | This file is part of the Lucid Widget Library. |
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h index d6069fad2d8..74eea3d4d79 100644 --- a/lwlib/lwlib-Xm.h +++ b/lwlib/lwlib-Xm.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* The lwlib interface to Motif widgets. | 1 | /* The lwlib interface to Motif widgets. |
| 2 | Copyright (C) 1994, 2000, 2002, 2003, 2004, | 2 | Copyright (C) 1994, 2000, 2002, 2003, 2004, |
| 3 | 2005 Free Software Foundation, Inc. | 3 | 2005, 2006 Free Software Foundation, Inc. |
| 4 | Copyright (C) 1992 Lucid, Inc. | 4 | Copyright (C) 1992 Lucid, Inc. |
| 5 | 5 | ||
| 6 | This file is part of the Lucid Widget Library. | 6 | This file is part of the Lucid Widget Library. |
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 8f5e7382086..7b35f0ce62a 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Implements a lightweight menubar widget. | 1 | /* Implements a lightweight menubar widget. |
| 2 | Copyright (C) 1992 Lucid, Inc. | 2 | Copyright (C) 1992 Lucid, Inc. |
| 3 | Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of the Lucid Widget Library. | 5 | This file is part of the Lucid Widget Library. |
| 6 | 6 | ||
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h index 93703358ccb..fa5dc887330 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Interface of a lightweight menubar widget. | 1 | /* Interface of a lightweight menubar widget. |
| 2 | Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 2 | Copyright (C) 2000, 2002, 2003, 2004, 2005, |
| 3 | 2006 Free Software Foundation, Inc. | ||
| 3 | 4 | ||
| 4 | This file is part of the Lucid Widget Library. | 5 | This file is part of the Lucid Widget Library. |
| 5 | 6 | ||
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h index ca2b7dc6a1a..ce170d7bfe4 100644 --- a/lwlib/xlwmenuP.h +++ b/lwlib/xlwmenuP.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Internals of a lightweight menubar widget. | 1 | /* Internals of a lightweight menubar widget. |
| 2 | Copyright (C) 1999, 2000, 2002, 2003, 2004, | 2 | Copyright (C) 1999, 2000, 2002, 2003, 2004, |
| 3 | 2005 Free Software Foundation, Inc. | 3 | 2005, 2006 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of the Lucid Widget Library. | 5 | This file is part of the Lucid Widget Library. |
| 6 | 6 | ||