diff options
| author | Miles Bader | 2007-07-31 05:50:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-31 05:50:45 +0000 |
| commit | 9899d01a0ccec166e04caa60657a44e614be50cd (patch) | |
| tree | 6f7874938065fd9808765059213ff7a94ab3268b /etc/tree-widget/folder/README | |
| parent | 96157d113ae5828cc280488211610db1960d572c (diff) | |
| parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
| download | emacs-9899d01a0ccec166e04caa60657a44e614be50cd.tar.gz emacs-9899d01a0ccec166e04caa60657a44e614be50cd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-838)
- Update from CVS
- Merge from emacs--rel--22
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Restore lisp/emacs-lisp/cl-loaddefs.el
* emacs--rel--22 (patch 70-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
Diffstat (limited to 'etc/tree-widget/folder/README')
| -rw-r--r-- | etc/tree-widget/folder/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/tree-widget/folder/README b/etc/tree-widget/folder/README index 2a5d156e70e..e611050b088 100644 --- a/etc/tree-widget/folder/README +++ b/etc/tree-widget/folder/README | |||
| @@ -6,4 +6,4 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png | |||
| 6 | no-handle.xpm open.png open.xpm | 6 | no-handle.xpm open.png open.xpm |
| 7 | Author: David Ponce <david.ponce@wanadoo.fr> | 7 | Author: David Ponce <david.ponce@wanadoo.fr> |
| 8 | Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. | 8 | Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
| 9 | License: GNU General Public License version 2 or later (see COPYING) | 9 | License: GNU General Public License version 3 or later (see COPYING) |