HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--rel--22
[bpt/emacs.git]
/
oldXMenu
/
Activate.c
diff --git
a/oldXMenu/Activate.c
b/oldXMenu/Activate.c
index
7bca866
..
4de752c
100644
(file)
--- a/
oldXMenu/Activate.c
+++ b/
oldXMenu/Activate.c
@@
-3,13
+3,13
@@
#include "copyright.h"
/*
#include "copyright.h"
/*
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
, 2008
Free Software Foundation, Inc.
Free Software Foundation, Inc.
-This program is free software
;
you can redistribute it and/or modify
+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
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 2, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-17,10
+17,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
-
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
/*
* XMenu: MIT Project Athena, X Window system menu package
/*
* XMenu: MIT Project Athena, X Window system menu package