diff options
| author | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2007-01-29 22:21:19 +0000 |
| commit | 93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b (patch) | |
| tree | 6e4e3bec20b8c65eb1f78b0ad302fa6c1977d355 /lwlib | |
| parent | 38db5c8d522cc1faa8190e77dbc932a5560e6aad (diff) | |
| parent | 5c4a60523827062803ab9a55b4325358225d66bf (diff) | |
| download | emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.tar.gz emacs-93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-599
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-600
Merge from erc--main--0
* emacs@sv.gnu.org/emacs--devo--0--patch-601
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-602
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-603
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-604
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-605
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-606
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-607
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-608
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-609
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-610
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-611
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-612
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-613
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-614
Make byte compiler correctly write circular constants
* emacs@sv.gnu.org/emacs--devo--0--patch-615
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-616
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-617
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-618
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-192
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-193
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-194
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-195
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-196
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 4 | ||||
| -rw-r--r-- | lwlib/lwlib-Xlw.c | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.c | 2 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.h | 4 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 | ||||
| -rw-r--r-- | lwlib/xlwmenu.h | 4 | ||||
| -rw-r--r-- | lwlib/xlwmenuP.h | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index d3e8c2eb4c3..b8fc313228b 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog | |||
| @@ -1334,8 +1334,8 @@ | |||
| 1334 | ;; add-log-time-zone-rule: t | 1334 | ;; add-log-time-zone-rule: t |
| 1335 | ;; End: | 1335 | ;; End: |
| 1336 | 1336 | ||
| 1337 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2006 | 1337 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, |
| 1338 | Free Software Foundation, Inc. | 1338 | 2005, 2006, 2007 Free Software Foundation, Inc. |
| 1339 | Copying and distribution of this file, with or without modification, | 1339 | Copying and distribution of this file, with or without modification, |
| 1340 | are permitted provided the copyright notice and this notice are preserved. | 1340 | are permitted provided the copyright notice and this notice are preserved. |
| 1341 | 1341 | ||
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index dd366e4cca1..7fbf8bd5f07 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, 2006 Free Software Foundation, Inc. | 4 | 2005, 2006, 2007 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 78ad165ef0e..f15bbdf7b39 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, 2006 Free Software Foundation, Inc. | 3 | 2004, 2005, 2006, 2007 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 74eea3d4d79..92112a1f946 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, 2001, 2002, 2003, 2004, |
| 3 | 2005, 2006 Free Software Foundation, Inc. | 3 | 2005, 2006, 2007 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 65b9685038e..bdd2194d500 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, 2006 Free Software Foundation, Inc. | 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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 9b7a6b099db..f14ffd72dab 100644 --- a/lwlib/xlwmenu.h +++ b/lwlib/xlwmenu.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Interface of a lightweight menubar widget. | 1 | /* Interface of a lightweight menubar widget. |
| 2 | Copyright (C) 2000, 2002, 2003, 2004, 2005, | 2 | Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, |
| 3 | 2006 Free Software Foundation, Inc. | 3 | 2006, 2007 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/xlwmenuP.h b/lwlib/xlwmenuP.h index b90bc3da827..7ad135ac7b7 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, 2001, 2002, 2003, 2004, |
| 3 | 2005, 2006 Free Software Foundation, Inc. | 3 | 2005, 2006, 2007 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 | ||