From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001 From: Andrzej Szeszo <aszeszo@gmail.com> Date: Tue, 04 Jun 2013 12:32:37 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster --- components/aalib/aalib.license | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/components/aalib/aalib.license b/components/aalib/aalib.license index 19c13d2..9831c23 100644 --- a/components/aalib/aalib.license +++ b/components/aalib/aalib.license @@ -1,10 +1,4 @@ -Copyright (C) 1997-2009 Jan Hubicka (hubicka@freesoft.cz) -Copyright (C) 1997-2009 Thomas A. K. Kjaer (takjaer@daimi.aau.dk) -Copyright (C) 1997-2009 Tim Newsome (nuisance@cmu.edu) -Copyright (C) 1997-2009 Kamil Toman (toman@artax.karlin.mff.cuni.cz) - - - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LIBRARY GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. @@ -57,7 +51,7 @@ want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations. - + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect @@ -104,7 +98,7 @@ Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -151,7 +145,7 @@ You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -209,7 +203,7 @@ ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -260,7 +254,7 @@ distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -314,7 +308,7 @@ accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -355,7 +349,7 @@ restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -407,7 +401,7 @@ the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -441,7 +435,7 @@ DAMAGES. END OF TERMS AND CONDITIONS - + Appendix: How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest -- Gitblit v1.9.3