summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <jose.r.fonseca@gmail.com>2014-12-29 18:28:45 +0000
committerJosé Fonseca <jose.r.fonseca@gmail.com>2014-12-29 18:29:01 +0000
commit155699ba60c62f51c0c35636057f67ce266b3e5f (patch)
tree4a5fa6dc802a8452339c8a9278885b004dd8d1cd
parenta819167f7daf8fe060efd75d02825b082f1fd255 (diff)
downloadmesa-demos-155699ba60c62f51c0c35636057f67ce266b3e5f.zip
mesa-demos-155699ba60c62f51c0c35636057f67ce266b3e5f.tar.xz
s/Tungsten Graphics/VMware/
Tungsten Graphics Inc. was acquired by VMware Inc. in 2008. Leaving the old copyright name is creating unnecessary confusion, hence this change.
-rw-r--r--src/egl/opengles2/es2tri.c2
-rw-r--r--src/xdemos/ipc.c36
2 files changed, 19 insertions, 19 deletions
diff --git a/src/egl/opengles2/es2tri.c b/src/egl/opengles2/es2tri.c
index 349a576..c85c072 100644
--- a/src/egl/opengles2/es2tri.c
+++ b/src/egl/opengles2/es2tri.c
@@ -1,6 +1,6 @@
/**************************************************************************
*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
* All Rights Reserved.
*
**************************************************************************/
diff --git a/src/xdemos/ipc.c b/src/xdemos/ipc.c
index c872d16..54c9236 100644
--- a/src/xdemos/ipc.c
+++ b/src/xdemos/ipc.c
@@ -1,21 +1,21 @@
-/* Copyright (c) 2003 Tungsten Graphics, Inc.
- *
- * 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, the Tungsten
- * Graphics splash screen, and this permission notice 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.
+/* Copyright (c) 2003 VMware, Inc.
+ *
+ * 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 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
+ * VMWARE 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.
*/
/*