aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fonts.src/Speedo
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-05 08:17:38 +0200
committermarha <marha@users.sourceforge.net>2011-08-05 08:17:38 +0200
commit67e52c577364b17e7339b04faf17c77cd3ad9b59 (patch)
tree0bc2b0c652907d4c9e4ba2f486754a23ca91147b /xorg-server/fonts.src/Speedo
parent23cc74efd16feb2676978b9919a8510ed7804ed9 (diff)
parentd105412503ea250e07d3cb008f10f60e6e48bf8a (diff)
downloadvcxsrv-67e52c577364b17e7339b04faf17c77cd3ad9b59.tar.gz
vcxsrv-67e52c577364b17e7339b04faf17c77cd3ad9b59.tar.bz2
vcxsrv-67e52c577364b17e7339b04faf17c77cd3ad9b59.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/texcompress_rgtc_tmp.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_print.c mesalib/src/mesa/program/prog_statevars.c mesalib/src/mesa/program/program.c mesalib/src/mesa/program/program_parse.y mesalib/src/mesa/program/program_parser.h mesalib/src/mesa/program/sampler.cpp mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/vbo/vbo_exec_array.c pixman/pixman/pixman-arm-neon-asm.S pixman/pixman/pixman-arm-neon.c
Diffstat (limited to 'xorg-server/fonts.src/Speedo')
0 files changed, 0 insertions, 0 deletions