From: Guenter B. <gu...@us...> - 2002-05-12 14:00:06
|
Update of /cvsroot/xine/gnome-xine In directory usw-pr-cvs1:/tmp/cvs-serv15051 Modified Files: COPYING Log Message: plain gpl 2 Index: COPYING =================================================================== RCS file: /cvsroot/xine/gnome-xine/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- COPYING 28 Feb 2002 20:54:40 -0000 1.1.1.1 +++ COPYING 12 May 2002 14:00:02 -0000 1.2 @@ -1,37 +1,3 @@ - -GnomeHello is Copyright (C) 1999 Havoc Pennington. The program is -released to you under two licenses, at your option; the first is -similar to that of the X Window System, the second is the GNU General -Public License. - -========================== -License Option Number One: -========================== - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES - OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -========================== -License Option Number Two: -========================== - GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -325,7 +291,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> 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 @@ -347,7 +313,7 @@ If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. |