summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Allanos <dju@gentoo.org>2005-07-04 22:37:39 +0000
committerJulien Allanos <dju@gentoo.org>2005-07-04 22:37:39 +0000
commitdbfb54d4963b51938ad92bc419edbf6f7df10484 (patch)
tree6584b49fc5faee9c0ae0e70f697d1c6ebfce2252 /licenses
parentAdd ~alpha keyword. (diff)
downloadgentoo-2-dbfb54d4963b51938ad92bc419edbf6f7df10484.tar.gz
gentoo-2-dbfb54d4963b51938ad92bc419edbf6f7df10484.tar.bz2
gentoo-2-dbfb54d4963b51938ad92bc419edbf6f7df10484.zip
Updated ClearSilver license.
Diffstat (limited to 'licenses')
-rw-r--r--licenses/CS-1.047
1 files changed, 24 insertions, 23 deletions
diff --git a/licenses/CS-1.0 b/licenses/CS-1.0
index f68f8352ca7e..186c973ace06 100644
--- a/licenses/CS-1.0
+++ b/licenses/CS-1.0
@@ -1,42 +1,44 @@
-Neotonic ClearSilver is available under the following license, derived from
-the Apache Software License v1.1. For alternative licensing, please contact
-the authors at clearsilver@neotonic.com
-Neotonic ClearSilver Software License
+ClearSilver is available under the following license, derived
+from the Apache Software License v1.1
+
+For alternative licensing, please contact the authors at
+blong@clearsilver.net
+
+ClearSilver Software License
Version 1.0
-Copyright (c) 2001 Brandon Long and Neotonic Software Corporation.
-All rights reserved.
+Copyright (c) 2003 Brandon Long. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any,
- must include the following acknowledgment:
+must include the following acknowledgment:
- "This product includes software developed by the
- Neotonic Software Corporation. (http://www.neotonic.com/)."
+ "This product includes software developed by
+ Neotonic Software Corp. (http://www.neotonic.com/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
+Alternately, this acknowledgment may appear in the software itself, if
+and wherever such third-party acknowledgments normally appear.
-4. The names "Neotonic" and "Neotonic ClearSilver" must not be used
- to endorse or promote products derived from this software without prior
- written permission. For written permission, please contact
- clearsilver@neotonic.com.
+4. The names "Neotonic" and "ClearSilver" must not be used
+to endorse or promote products derived from this software without prior
+written permission. For written permission, please contact
+clearsilver@neotonic.com.
5. Products derived from this software may not be called "ClearSilver", nor
- may "ClearSilver" appear in their name, without prior written permission of
- Neotonic Software Corporation.
+may "ClearSilver" appear in their name, without prior written permission of
+Brandon Long or Neotonic Software Corp.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -51,9 +53,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many
-individuals on behalf of Neotonic Software Corporation. For more
-information on Neotonic Software Corporation, please see
-<http://www.neotonic.com/>.
+individuals on behalf of Brandon Long and Neotonic Software Corp. For
+more information on Neotonic, please see <http://www.neotonic.com/>.
Some of the concepts of this software are based on previous software
developed by Scott Shambarger, Paul Clegg, and John Cwikla. The current