Mercurial > hg > xemacs-beta
diff src/ExternalShellP.h @ 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/ExternalShellP.h Sat Feb 20 06:03:00 2010 -0600 +++ b/src/ExternalShellP.h Sun May 01 18:44:03 2011 +0100 @@ -1,20 +1,18 @@ /* External shell widget internal header file. Copyright (C) 1993, 1994 Sun Microsystems, Inc. -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. +This library 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 3 of the License, or (at your +option) any later version. -This library 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 -Library General Public License for more details. +This library 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 Library General Public -License along with this library; if not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +You should have received a copy of the GNU General Public License +along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */