diff options
author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
---|---|---|
committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-09-06 13:15:04 +0200 |
commit | f02f63997ce65530788a6dfcb28f11790a14d938 (patch) | |
tree | fc6aedb5256bfb84eb170cb82addd2b6605510f8 /docs/contents.html | |
parent | e95e76e1255a3ad0ce604271301d090337b2e82b (diff) | |
parent | 9778731732b4753e79a1b786c65325a52392411d (diff) |
Merge branch 'master' into r300-compiler
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
Diffstat (limited to 'docs/contents.html')
-rw-r--r-- | docs/contents.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/contents.html b/docs/contents.html index 1dca3a228d..d15e6c1e33 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -39,7 +39,6 @@ a:visited { <ul> <li><a href="download.html" target="MainFrame">Downloading / Unpacking</a> <li><a href="install.html" target="MainFrame">Compiling / Installing</a> -<li><a href="glu.html" target="MainFrame">SGI's GLU</a> <li><a href="precompiled.html" target="MainFrame">Precompiled Libraries</a> </ul> @@ -68,6 +67,7 @@ a:visited { <li><a href="repository.html" target="MainFrame">Source Code Repository</a> <li><a href="memory.html" target="MainFrame">DRI Memory Management</a> <li><a href="shading.html" target="MainFrame">Shading Language</a> +<li><a href="glu.html" target="MainFrame">SGI's GLU</a> <li><a href="utilities.html" target="MainFrame">Utilities</a> <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a> <li><a href="devinfo.html" target="MainFrame">Development Notes</a> |