Mercurial > emacs
diff mac/src/Emacs.r @ 90737:95d0cdf160ea
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Jan 2007 06:16:11 +0000 |
| parents | bc10a33dd40b 509f6ba78c65 |
| children | dd7c098af727 |
line wrap: on
line diff
--- a/mac/src/Emacs.r Fri Jan 26 02:30:28 2007 +0000 +++ b/mac/src/Emacs.r Fri Jan 26 06:16:11 2007 +0000 @@ -1,6 +1,6 @@ /* Resource definitions for GNU Emacs on the Macintosh. - Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -221,10 +221,10 @@ 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ alpha, /* development, alpha, beta, or final (release) */ - 92, /* Non-final release # */ + 93, /* Non-final release # */ 0, /* Region code */ - "22.0.92", /* Short version number */ - "22.0.92, Copyright \0xa9 2006 " + "22.0.93", /* Short version number */ + "22.0.93, Copyright \0xa9 2007 " "Free Software Foundation, Inc." /* Long version number */ };