aboutsummaryrefslogtreecommitdiff
path: root/gl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-09 08:25:48 +0200
committermarha <marha@users.sourceforge.net>2011-08-09 08:25:48 +0200
commit8a2c8f93072dc4c9a1f9275b09ac3f2af481f56a (patch)
tree24b60778dfbd64e217b8b08ae4ce465687128d80 /gl
parentf8e53281a55d43ae1b17f848f28579d74d877835 (diff)
parent93ed12672618a2e321cb79a3b3a656aae63d6beb (diff)
downloadvcxsrv-8a2c8f93072dc4c9a1f9275b09ac3f2af481f56a.tar.gz
vcxsrv-8a2c8f93072dc4c9a1f9275b09ac3f2af481f56a.tar.bz2
vcxsrv-8a2c8f93072dc4c9a1f9275b09ac3f2af481f56a.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/extensions/randr.h mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_program.c
Diffstat (limited to 'gl')
0 files changed, 0 insertions, 0 deletions