diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
| commit | 47ad296a183929c2007c35c60d722b4ac680417d (patch) | |
| tree | 62bcc7af01606d32d7f137ccf8f342c9b0a6774a /docs/intro.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/intro.html')
| -rw-r--r-- | docs/intro.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/intro.html b/docs/intro.html index 0e37322823..aae2e6e192 100644 --- a/docs/intro.html +++ b/docs/intro.html @@ -22,9 +22,10 @@ for modern GPUs. <p> Mesa ties into several other open-source projects: the -<a href="http://dri.sf.net/" target="_parent">Direct Rendering Infrastructure</a> -and <a href="http://x.org" target="_parent">X.org</a> to provide OpenGL -support to users of X on Linux, FreeBSD and other operating systems. +<a href="http://dri.freedesktop.org/" target="_parent">Direct Rendering +Infrastructure</a> and <a href="http://x.org" target="_parent">X.org</a> to +provide OpenGL support to users of X on Linux, FreeBSD and other operating +systems. </p> |