summaryrefslogtreecommitdiff
path: root/xc/lib/X11/Text.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/X11/Text.c')
-rw-r--r--xc/lib/X11/Text.c37
1 files changed, 25 insertions, 12 deletions
diff --git a/xc/lib/X11/Text.c b/xc/lib/X11/Text.c
index e1f1e00b6..afe9920ed 100644
--- a/xc/lib/X11/Text.c
+++ b/xc/lib/X11/Text.c
@@ -1,16 +1,29 @@
-/* $XConsortium: Text.c,v 11.23 93/09/18 12:32:32 rws Exp $ */
-/* Copyright Massachusetts Institute of Technology 1986 */
-
+/* $XConsortium: Text.c,v 11.24 93/11/05 11:13:19 kaleb Exp $ */
/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission. M.I.T. makes no representations about the
-suitability of this software for any purpose. It is provided "as is"
-without express or implied warranty.
+
+Copyright (c) 1986 X Consortium
+
+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
+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 the X Consortium 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 X Consortium.
+
*/
#include "Xlibint.h"