vcxsrv - VcXsrv Windows X Server (X2Go/Arctica Builds)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-08-05	1	-28/+28
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	mesa pixman git update 5 aug 2011	marha	2011-08-05	1	-28/+28
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-28	1	-1/+5
\|\\|
\| *	xserver xkeyboard-config mesa git update 28 Apr 2011	marha	2011-04-28	1	-1/+5
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-27	1	-3/+8
\|\\|
\| *	xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011	marha	2011-04-27	1	-3/+8
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-14	1	-0/+29
\|\\|
\| *	server xkeyboard-config mesa git update 14 Apr 2011	marha	2011-04-14	1	-0/+29
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-04	1	-2/+2
\|\\|
\| *	xserver xkeyboard-config mesa git update 4 Marc 2011	marha	2011-03-04	1	-2768/+2768
\|/
*	xserver and mesa git update 28-12-2010	marha	2010-12-28	1	-2768/+2768
\|
*	Added missing needed files for mesalib	marha	2010-11-23	1	-0/+2768