summaryrefslogtreecommitdiff
path: root/src/regex.c
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-07-27 10:52:18 +0000
committerMiles Bader <miles@gnu.org>2007-07-27 10:52:18 +0000
commit1cb21c8ead36b165fee8c502039cee23ecfd9c10 (patch)
tree1251acb5a614f202f45a7cb579ef3af39623732f /src/regex.c
parent46cbff4ce222d6a5abebc8567efbc50ac7647988 (diff)
parenta92cecdac0c9cddf3910557a6ed5e055c0966058 (diff)
downloademacs-1cb21c8ead36b165fee8c502039cee23ecfd9c10.tar.gz
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 824-831) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 70-74) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
Diffstat (limited to 'src/regex.c')
-rw-r--r--src/regex.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/regex.c b/src/regex.c
index 48f0dd92737..c6d6c36a0bc 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,11 +3,12 @@
internationalization features.)
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2002, 2003, 2004, 2005, 2006, 2007
+ Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,