aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-01-19 14:11:48 +0100
committermarha <marha@users.sourceforge.net>2014-01-19 14:11:48 +0100
commit4f12e5d53c8a349320883b093c19d91874f9f46a (patch)
tree309dddb90bb1f4a8dba8d81a86f49e69b335c901 /mesalib/src/mesa/state_tracker/st_cb_queryobj.c
parent1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff)
downloadvcxsrv-4f12e5d53c8a349320883b093c19d91874f9f46a.tar.gz
vcxsrv-4f12e5d53c8a349320883b093c19d91874f9f46a.tar.bz2
vcxsrv-4f12e5d53c8a349320883b093c19d91874f9f46a.zip
fontconfig mesa git update 19 Jan 2013
fontconfig commit 5918d5bea5416cf27061db4263aefeb8fd310f0e mesa commit a33d1339d5bfb32377be92957a493f0e3d84b31e
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_queryobj.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_queryobj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
index 24ce6351d..5186a5157 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
* 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.