aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/render
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-04 16:54:51 +0200
committermarha <marha@users.sourceforge.net>2011-08-04 16:54:51 +0200
commit23cc74efd16feb2676978b9919a8510ed7804ed9 (patch)
tree15324c9a805744a54489f24c95f5eb94a0cc7adf /xorg-server/render
parent30aa3aea81afd082cba94028183ac9d5c7c1e123 (diff)
parent9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff)
downloadvcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.gz
vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.bz2
vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/mesa/program/ir_to_mesa.cpp xorg-server/composite/compalloc.c xorg-server/configure.ac xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Makefile.am xorg-server/hw/xquartz/xpr/xprFrame.c xorg-server/include/windowstr.h
Diffstat (limited to 'xorg-server/render')
0 files changed, 0 insertions, 0 deletions