svn merge "^/branches/released" .

added XtErrorDB file

1 files changed, 54 insertions, 0 deletions

diff --git a/xorg-server/bitmaps/COPYING b/xorg-server/bitmaps/COPYING
new file mode 100644
index 000000000..c80ef7d2d
--- /dev/null
+++ b/xorg-server/bitmaps/COPYING
@@ -0,0 +1,54 @@
+Copyright (c) 1998 The Open Group
+
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+X Window System is a trademark of The Open Group.
+
+Copyright 1988 by Evans & Sutherland Computer Corporation, 
+Salt Lake City, Utah
+
+                       All Rights Reserved                       
+                                                                 
+Permission to use, copy, modify, and distribute this software and
+its documentation  for  any  purpose  and  without  fee is hereby
+granted, provided that the above copyright notice appear  in  all
+copies and that both  that  copyright  notice  and  this  permis-
+sion  notice appear in supporting  documentation,  and  that  the
+name  of Evans & Sutherland  not be used in advertising or publi-
+city pertaining to distribution  of the software without  specif-
+ic, written prior permission.                                    
+                                                                 
+EVANS  & SUTHERLAND  DISCLAIMS  ALL  WARRANTIES  WITH  REGARD  TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILI-
+TY AND FITNESS, IN NO EVENT SHALL EVANS &  SUTHERLAND  BE  LIABLE
+FOR  ANY  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY  DAM-
+AGES  WHATSOEVER RESULTING FROM  LOSS OF USE,  DATA  OR  PROFITS,
+WHETHER   IN  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE  OR PER-
+FORMANCE OF THIS SOFTWARE.                                       
+