diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
| commit | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (patch) | |
| tree | 906904bdff9c33a3f9ded24ba8c89488469c5d94 /mesalib/docs/license.html | |
| parent | 821b51e814fe14d35f3807c525e4387022b9ed80 (diff) | |
| parent | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff) | |
| download | vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.gz vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.bz2 vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xserver pixman mesa git update 20 sep 2012
Conflicts:
libxcb/src/xcb_conn.c
Diffstat (limited to 'mesalib/docs/license.html')
| -rw-r--r-- | mesalib/docs/license.html | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mesalib/docs/license.html b/mesalib/docs/license.html index d69c673ce..35f85853d 100644 --- a/mesalib/docs/license.html +++ b/mesalib/docs/license.html @@ -2,19 +2,26 @@ <html lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>License / Cppyright Information</title> + <title>License / Copyright Information</title> <link rel="stylesheet" type="text/css" href="mesa.css"> </head> <body> +<div class="header"> + <h1>The Mesa 3D Graphics Library</h1> +</div> + +<iframe src="contents.html"></iframe> +<div class="content"> + <h1>Disclaimer</h1> <p> Mesa is a 3-D graphics library with an API which is very similar to -that of <a href="http://www.opengl.org/" target="_parent">OpenGL</a>.* +that of <a href="http://www.opengl.org/">OpenGL</a>.* To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from <a -href="http://www.sgi.com/" target="_parent">Silicon Graphics, +href="http://www.sgi.com/">Silicon Graphics, Inc.</a>(SGI). However, the author does not possess an OpenGL license from SGI, and makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with SGI. Those who want a @@ -30,7 +37,7 @@ library</em>. <br> <p> * OpenGL is a trademark of <a href="http://www.sgi.com/" -target="_parent">Silicon Graphics Incorporated</a>. +>Silicon Graphics Incorporated</a>. </p> @@ -101,6 +108,6 @@ Ext headers include/GL/glext.h Khronos In general, consult the source files for license terms. </p> - +</div> </body> </html> |