diff options
author | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-12-17 15:04:56 +0000 |
commit | 1772aa9a9c51332dee3cb942c2d69125ac9a67dc (patch) | |
tree | 5a18f22bf0d174b014a9d3b1b1723a3d4730c9c6 /xorg-server/fb/fbcmap.c | |
parent | cc7c9d67342d9d79ab9f490db492902f7aab2bbb (diff) | |
parent | d34fc70fab4607f70184206a592397c97c3e478e (diff) | |
download | vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.gz vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.tar.bz2 vcxsrv-1772aa9a9c51332dee3cb942c2d69125ac9a67dc.zip |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/fb/fbcmap.c')
-rw-r--r-- | xorg-server/fb/fbcmap.c | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/xorg-server/fb/fbcmap.c b/xorg-server/fb/fbcmap.c index 207c6aefc..2ff3234b5 100644 --- a/xorg-server/fb/fbcmap.c +++ b/xorg-server/fb/fbcmap.c @@ -1,32 +1,25 @@ -/************************************************************ -Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. - - 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 no- -tice appear in all copies and that both that copyright no- -tice and this permission notice appear in supporting docu- -mentation, and that the names of Sun or X Consortium -not be used in advertising or publicity pertaining to -distribution of the software without specific prior -written permission. Sun and X Consortium make no -representations about the suitability of this software for -any purpose. It is provided "as is" without any express or -implied warranty. - -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- -ABLE FOR 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. - -********************************************************/ - +/* + * Copyright © 1987 Sun Microsystems, Inc. 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, 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 (including the next + * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. + */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> |