aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/doc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-06 16:00:59 +0200
committermarha <marha@users.sourceforge.net>2011-09-06 16:00:59 +0200
commit788b9f4552ce114eb6d433bcb39e2de4acebef5d (patch)
treec9c1dd2dfbddd353202e10dc5deb294bc6e528d1 /xorg-server/doc
parentaacd7c23fef5e89f26b4d23964ac8ebe93fd9cbe (diff)
parent53da0b7e7c183ea15692234332b3e337b3fb0cc0 (diff)
downloadvcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.gz
vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.tar.bz2
vcxsrv-788b9f4552ce114eb6d433bcb39e2de4acebef5d.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/docs/GL3.txt mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h mesalib/src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'xorg-server/doc')
0 files changed, 0 insertions, 0 deletions