From acca49b1a5a6c034f3b9d51d9016b8a7d43da809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 31 Mar 2006 17:39:35 +0000 Subject: [PATCH] =?UTF-8?q?Fri=20Mar=2031=2012:37:16=202006=20S=C3=B8ren?= =?UTF-8?q?=20Sandmann=20=20Fix=20copyright=20stateme?= =?UTF-8?q?nt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 4 ++++ dix/window.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82f0d07b1..205eb2207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 31 12:37:16 2006 Søren Sandmann + + * dix/window.c: Fix copyright statement + 2006-03-31 Egbert Eich * mi/miwideline.c: (miFillRectPolyHelper), (miLineArc): diff --git a/dix/window.c b/dix/window.c index 0747d8668..f00f63714 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,8 +1,8 @@ -/* $XdotOrg: xserver/xorg/dix/window.c,v 1.14 2006/02/15 20:44:12 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/dix/window.c,v 1.16 2006/03/29 17:51:54 deronj Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* -Copyright (c) 2004, Sun Microsystems, Inc. +Copyright (c) 2006, Red Hat, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -16,13 +16,13 @@ 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 -SUN MICROSYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +RED HAT 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 Sun Microsystems shall not be +Except as contained in this notice, the name of Red Hat shall not be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from Sun Microsystems. +in this Software without prior written authorization from Red Hat. Copyright 1987, 1998 The Open Group