Mercurial > hg > xemacs-beta
diff src/glade.c @ 5495:1f0b15040456
Merge.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 May 2011 18:44:03 +0100 |
parents | 2aa9cd456ae7 |
children |
line wrap: on
line diff
--- a/src/glade.c Sat Feb 20 06:03:00 2010 -0600 +++ b/src/glade.c Sun May 01 18:44:03 2011 +0100 @@ -9,21 +9,18 @@ ** ** This file is part of XEmacs. ** -** XEmacs is free software; you can redistribute it and/or modify it +** XEmacs 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) any -** later version. -** +** Free Software Foundation, either version 3 of the License, or (at your +** option) any later version. +** ** XEmacs is distributed in the hope that it will be useful, but WITHOUT ** ANY WARRANTY; without even the implied warranty of 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 -** along with XEmacs; see the file COPYING. If not, write to -** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -** Boston, MA 02111-1301, USA. */ -*/ +** along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ #if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H)