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 /src/mktime.c | |
| 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 'src/mktime.c')
| -rw-r--r-- | src/mktime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mktime.c b/src/mktime.c index c61f1463564..025f54d95c2 100644 --- a/src/mktime.c +++ b/src/mktime.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Convert a `struct tm' to a time_t value. | 1 | /* Convert a `struct tm' to a time_t value. |
| 2 | Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. | 2 | Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004, |
| 3 | 2005 Free Software Foundation, Inc. | ||
| 3 | Contributed by Paul Eggert (eggert@twinsun.com). | 4 | Contributed by Paul Eggert (eggert@twinsun.com). |
| 4 | 5 | ||
| 5 | NOTE: The canonical source of this file is maintained with the GNU C Library. | 6 | NOTE: The canonical source of this file is maintained with the GNU C Library. |