aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fonts.src/misc/COPYING
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-11 19:27:48 +0000
committermarha <marha@users.sourceforge.net>2009-10-11 19:27:48 +0000
commitd36223b06a859c5979253d0176adfaeadc10cb32 (patch)
treede85a6072aae048506ebab0dba2e7c4588132412 /xorg-server/fonts.src/misc/COPYING
parent6b4cfac5a67f87884a525ce2c99f30e0060b3ca7 (diff)
parente4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff)
downloadvcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.gz
vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.bz2
vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/misc/COPYING')
-rw-r--r--xorg-server/fonts.src/misc/COPYING24
1 files changed, 1 insertions, 23 deletions
diff --git a/xorg-server/fonts.src/misc/COPYING b/xorg-server/fonts.src/misc/COPYING
index df9e26171..c4be78925 100644
--- a/xorg-server/fonts.src/misc/COPYING
+++ b/xorg-server/fonts.src/misc/COPYING
@@ -1,23 +1 @@
-Copyright 1996, 1997, 1998, 1999 Computing Research Labs,
-New Mexico State University
-
-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 COMPUTING RESEARCH LAB
-OR NEW MEXICO STATE UNIVERSITY 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.
+"Public domain font. Share and enjoy."