summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-05-24 13:59:50 -0700
committerEric Anholt <eric@anholt.net>2007-05-24 16:46:54 -0700
commitfd9d27e0686f5a15803d13d207e58be1972fdf31 (patch)
tree79f8847e0fd723567032fa201d7b3ff2fdf5621d /docs
parentb1fcabefa2f3fa81a20c1556383458315bb49bbf (diff)
parentf116aed1ede0d802e9f3c5989290002975c00330 (diff)
Merge branch 'master' into i915-unification
Conflicts: src/mesa/drivers/dri/i915tex/i830_texstate.c src/mesa/drivers/dri/i915tex/i915_texstate.c
Diffstat (limited to 'docs')
-rw-r--r--docs/relnotes-7.1.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/relnotes-7.1.html b/docs/relnotes-7.1.html
index 974b3096ea..b684447e70 100644
--- a/docs/relnotes-7.1.html
+++ b/docs/relnotes-7.1.html
@@ -23,6 +23,7 @@ TBD
<h2>New features</h2>
<ul>
+<li>GL_EXT_texture_from_pixmap extension for Xlib driver
</ul>