summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2011-11-19 14:34:44 +0100
committerTormod Volden <debian.tormod@gmail.com>2011-11-19 15:19:04 +0100
commit5baec03151d4b6c17f0f4e12c575187c6f9bd7c9 (patch)
tree112e619c63025f1e6898e56ac2a19c4c34ea981d
parent3b209c98859cdf4c09aa9af4d6cd215adb8231e9 (diff)
copyright: Delete duplicated text
The same text was written twice. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
-rw-r--r--copyright24
1 files changed, 0 insertions, 24 deletions
diff --git a/copyright b/copyright
index 07621d4..a8d0051 100644
--- a/copyright
+++ b/copyright
@@ -22,27 +22,3 @@ Except as contained in this notice, the name of S3, Incorporated shall not be
used in advertising or otherwise to promote the sale, use or other dealings in
this Software without prior written authorization from the S3, Incorporated.
-
-Copyright (C) 2000 S3, Incorporated.
-
-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, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
-CONSORTIUM 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.
-
-Except as contained in this notice, the name of S3, Incorporated shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the S3, Incorporated.
-