gnome-build r499 - trunk

[naba svn gnome org]

Author: naba
Date: Wed Feb  6 20:43:52 2008
New Revision: 499
URL: http://svn.gnome.org/viewvc/gnome-build?rev=499&view=rev

Log:
	* COPYING: Fixed license.


Modified:
   trunk/COPYING
   trunk/ChangeLog

Modified: trunk/COPYING
==============================================================================
--- trunk/COPYING	(original)
+++ trunk/COPYING	Wed Feb  6 20:43:52 2008
@@ -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