diff options
| author | Alan Hourihane <[email protected]> | 2008-09-11 17:32:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-09-11 17:32:18 +0100 |
| commit | 47ad296a183929c2007c35c60d722b4ac680417d (patch) | |
| tree | 62bcc7af01606d32d7f137ccf8f342c9b0a6774a /docs/contents.html | |
| parent | b6458225039ef4cf5c91080e7547ed73fb264c46 (diff) | |
| parent | 4d42c5bebf8740ebfc15571d24b6c92f79e09263 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'docs/contents.html')
| -rw-r--r-- | docs/contents.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/contents.html b/docs/contents.html index 3feb8cae94f..257b13f68a7 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -48,6 +48,7 @@ a:visited { <li><a href="lists.html" target="MainFrame">Mailing Lists</a> <li><a href="bugs.html" target="MainFrame">Bug Database</a> <li><a href="webmaster.html" target="MainFrame">Webmaster</a> +<li><a href="http://dri.freedesktop.org/" target="MainFrame">Wiki</a> </ul> <b>User Topics</b> |