diff options
author | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
commit | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch) | |
tree | 4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/docs | |
parent | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff) | |
parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
download | vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2 vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config git update 3 Oct 2003
Conflicts:
xorg-server/xkeyboard-config/symbols/level3
xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'mesalib/docs')
-rw-r--r-- | mesalib/docs/GL3.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 9b056d016..b16ec6fdb 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -105,7 +105,7 @@ GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader not started GL_ARB_texture_buffer_object_rgb32 DONE (i965, softpipe) GL_ARB_texture_cube_map_array DONE (i965, softpipe) -GL_ARB_texture_gather started (Maxence, Chris) +GL_ARB_texture_gather DONE (i965) GL_ARB_transform_feedback2 DONE GL_ARB_transform_feedback3 DONE |