aboutsummaryrefslogtreecommitdiff
path: root/mesalib/docs/developers.html
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-20 08:33:45 +0200
committermarha <marha@users.sourceforge.net>2012-09-20 08:33:45 +0200
commit210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (patch)
tree906904bdff9c33a3f9ded24ba8c89488469c5d94 /mesalib/docs/developers.html
parent821b51e814fe14d35f3807c525e4387022b9ed80 (diff)
parent06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff)
downloadvcxsrv-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/developers.html')
-rw-r--r--mesalib/docs/developers.html14
1 files changed, 11 insertions, 3 deletions
diff --git a/mesalib/docs/developers.html b/mesalib/docs/developers.html
index e1c52ac0d..86844ccae 100644
--- a/mesalib/docs/developers.html
+++ b/mesalib/docs/developers.html
@@ -7,13 +7,20 @@
</head>
<body>
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="contents.html"></iframe>
+<div class="content">
+
<h1>Developers</h1>
<p>
Both professional and volunteer developers contribute to Mesa.
</p>
<p>
-<a href="http://www.vmware.com/" target="_parent">VMware</a>
+<a href="http://www.vmware.com/">VMware</a>
employs several of the main Mesa developers including Brian Paul
and Keith Whitwell.
</p>
@@ -31,13 +38,13 @@ including:
<p>
Other companies including
-<a href="http://www.intellinuxgraphics.org/index.html" target="_parent">Intel</a>
+<a href="http://www.intellinuxgraphics.org/index.html">Intel</a>
and RedHat also actively contribute to the project.
Intel has recently contributed the new GLSL compiler in Mesa 7.9.
</p>
<p>
-<a href="http://www.lunarg.com/" target="_parent">LunarG</a> can be contacted
+<a href="http://www.lunarg.com/">LunarG</a> can be contacted
for custom Mesa / 3D graphics development.
</p>
@@ -46,5 +53,6 @@ Volunteers have made significant contributions to all parts of Mesa, including
complete device drivers.
</p>
+</div>
</body>
</html>