diff options
| author | Miles Bader | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /src/strftime.c | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'src/strftime.c')
| -rw-r--r-- | src/strftime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/strftime.c b/src/strftime.c index 88800c0d408..7a9506e55d3 100644 --- a/src/strftime.c +++ b/src/strftime.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 1 | /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
| 2 | 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | 2 | 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
| 3 | Free Software Foundation, Inc. | ||
| 3 | 4 | ||
| 4 | NOTE: The canonical source of this file is maintained with gnulib. | 5 | NOTE: The canonical source of this file is maintained with gnulib. |
| 5 | Bugs can be reported to bug-gnulib@gnu.org. | 6 | Bugs can be reported to bug-gnulib@gnu.org. |