diff options
| author | Karoly Lorentey | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /lib-src/vcdiff | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
| download | emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.gz emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.zip | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
Diffstat (limited to 'lib-src/vcdiff')
| -rwxr-xr-x | lib-src/vcdiff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/vcdiff b/lib-src/vcdiff index 8e1722d43ba..a57811a7f6d 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff | |||
| @@ -3,8 +3,8 @@ | |||
| 3 | # Enhanced sccs diff utility for use with vc mode. | 3 | # Enhanced sccs diff utility for use with vc mode. |
| 4 | # This version is more compatible with rcsdiff(1). | 4 | # This version is more compatible with rcsdiff(1). |
| 5 | # | 5 | # |
| 6 | # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004 | 6 | # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, |
| 7 | # Free Software Foundation, Inc. | 7 | # 2005 Free Software Foundation, Inc. |
| 8 | # | 8 | # |
| 9 | # This file is part of GNU Emacs. | 9 | # This file is part of GNU Emacs. |
| 10 | # | 10 | # |