diff options
author | marha <marha@users.sourceforge.net> | 2012-09-24 08:40:01 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:50:12 +0200 |
commit | c24a0fccb18e611b2879e68565ab8f1c5c5dbd62 (patch) | |
tree | 8b2070725227ae6c92ded43789f80347fabac306 /mesalib/docs/contents.html | |
parent | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (diff) | |
parent | 0ebcd32e91486caccc041c8ca23e39e160b24702 (diff) | |
download | vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.gz vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.bz2 vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 24 sep 2012
Conflicts:
pixman/pixman/pixman-sse2.c
xorg-server/dix/window.c
Diffstat (limited to 'mesalib/docs/contents.html')
-rw-r--r-- | mesalib/docs/contents.html | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html index 94b538da1..b9a892201 100644 --- a/mesalib/docs/contents.html +++ b/mesalib/docs/contents.html @@ -41,6 +41,10 @@ <ul> <li><a href="download.html" target="_parent">Downloading / Unpacking</a> <li><a href="install.html" target="_parent">Compiling / Installing</a> + <ul> + <li><a href="autoconf.html" target="_parent">Autoconf</a></li> + </ul> +</li> <li><a href="precompiled.html" target="_parent">Precompiled Libraries</a> </ul> @@ -85,11 +89,6 @@ <li><a href="http://www.opengl.org" target="_parent">OpenGL website</a> <li><a href="http://dri.freedesktop.org" target="_parent">DRI website</a> <li><a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a> -<li><a href="games.html" target="_parent">Games and Entertainment</a> -<li><a href="libraries.html" target="_parent">Libraries and Toolkits</a> -<li><a href="modelers.html" target="_parent">Modeling and Rendering</a> -<li><a href="science.html" target="_parent">Science and Technical</a> -<li><a href="utility.html" target="_parent">Utilities</a> </ul> <b>Hosted by:</b> |