Mesa (gallium-mesa-7.4): glsl-tri: fix copyright & description
Keith Whitwell
keithw at kemper.freedesktop.org
Thu Feb 19 15:32:13 UTC 2009
Module: Mesa
Branch: gallium-mesa-7.4
Commit: 1350ef12eab20bd74733db1f72bf96624df4128c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1350ef12eab20bd74733db1f72bf96624df4128c
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 19 15:29:50 2009 +0000
glsl-tri: fix copyright & description
---
progs/xdemos/glsl-tri.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/progs/xdemos/glsl-tri.c b/progs/xdemos/glsl-tri.c
index 3920049..bcae421 100644
--- a/progs/xdemos/glsl-tri.c
+++ b/progs/xdemos/glsl-tri.c
@@ -1,12 +1,32 @@
/**************************************************************************
*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2009 VMware 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, sub license, 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 NON-INFRINGEMENT.
+ * 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.
+ *
**************************************************************************/
/*
- * Draw a triangle with X/EGL and OpenGL ES 2.x
+ * Draw a triangle with GLSL and glx
*/
More information about the mesa-commit
mailing list