Skip to content

Commit 0c07bfb

Browse files
committed
modesetting: Merge modesetting's COPYING into the xserver's.
Signed-off-by: Eric Anholt <[email protected]> Reviewed-by: Keith Packard <[email protected]>
1 parent 35dc7c7 commit 0c07bfb

File tree

2 files changed

+24
-44
lines changed

2 files changed

+24
-44
lines changed

COPYING

+24
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ possible, and insert their name to this list. Please sort by surname
88
for people, and by the full name for other entities (e.g. Juliusz
99
Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
1010

11+
Copyright © 2011 Dave Airlie
1112
Copyright © 2000-2001 Juliusz Chroboczek
1213
Copyright © 1998 Egbert Eich
1314
Copyright © 2006-2007 Intel Corporation
@@ -145,6 +146,29 @@ used in advertising or otherwise to promote the sale, use or other dealings
145146
in this Software without prior written authorization from the X Consortium.
146147

147148

149+
Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
150+
151+
Permission is hereby granted, free of charge, to any person obtaining a
152+
copy of this software and associated documentation files (the
153+
"Software"), to deal in the Software without restriction, including
154+
without limitation the rights to use, copy, modify, merge, publish,
155+
distribute, sub license, and/or sell copies of the Software, and to
156+
permit persons to whom the Software is furnished to do so, subject to
157+
the following conditions:
158+
159+
The above copyright notice and this permission notice (including the
160+
next paragraph) shall be included in all copies or substantial portions
161+
of the Software.
162+
163+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
164+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
165+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
166+
IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
167+
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
168+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
169+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
170+
171+
148172
Copyright © 1999-2000 SuSE, Inc.
149173
Copyright © 2007 Red Hat, Inc.
150174

hw/xfree86/drivers/modesetting/COPYING

-44
This file was deleted.

0 commit comments

Comments
 (0)