aboutsummaryrefslogtreecommitdiff
path: root/X11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-08 13:46:22 +0200
committermarha <marha@users.sourceforge.net>2011-08-08 13:46:22 +0200
commitf8e53281a55d43ae1b17f848f28579d74d877835 (patch)
tree99933c3a0638a93e28ee2e1d5a2c23c97b0a94ba /X11
parent67e52c577364b17e7339b04faf17c77cd3ad9b59 (diff)
parent0c2b3e6fd26158cb97f4210cc891e218801b4b25 (diff)
downloadvcxsrv-f8e53281a55d43ae1b17f848f28579d74d877835.tar.gz
vcxsrv-f8e53281a55d43ae1b17f848f28579d74d877835.tar.bz2
vcxsrv-f8e53281a55d43ae1b17f848f28579d74d877835.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_cb_blit.c xorg-server/xkeyboard-config/rules/base.o_s.part xorg-server/xkeyboard-config/rules/base.xml.in
Diffstat (limited to 'X11')
0 files changed, 0 insertions, 0 deletions