diff options
author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
tree | 81b2652d421992fd63143a04885e332e83e18d07 /mesalib/docs/license.html | |
parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/docs/license.html')
-rw-r--r-- | mesalib/docs/license.html | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/mesalib/docs/license.html b/mesalib/docs/license.html index 913dd4109..f0ac28ccf 100644 --- a/mesalib/docs/license.html +++ b/mesalib/docs/license.html @@ -1,12 +1,13 @@ -<HTML> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>License / Cppyright Information</title> + <link rel="stylesheet" type="text/css" href="mesa.css"> +</head> +<body> -<TITLE>License / Cppyright Information</TITLE> - -<link rel="stylesheet" type="text/css" href="mesa.css"></head> - -<BODY> - -<H1>Disclaimer</H1> +<h1>Disclaimer</h1> <p> Mesa is a 3-D graphics library with an API which is very similar to @@ -34,7 +35,7 @@ target="_parent">Silicon Graphics Incorporated</a>. -<H1>License / Copyright Information</H1> +<h1>License / Copyright Information</h1> <p> The Mesa distribution consists of several components. Different copyrights @@ -73,7 +74,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </pre> -<H1>Attention, Contributors</H1> +<h1>Attention, Contributors</h1> <p> When contributing to the Mesa project you must agree to the licensing terms @@ -83,7 +84,7 @@ and their respective licenses. </p> -<H1>Mesa Component Licenses</H1> +<h1>Mesa Component Licenses</h1> <pre> Component Location License |