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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-06-10	1	-8/+0
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am
\| *	xwininfo xkeyboard-config git update 10 juni 2011	marha	2011-06-10	1	-8/+0
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-09	1	-0/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
\| *	mesa xkbcomp xkeyboard-config git update 9 Jun 2011	marha	2011-06-09	1	-0/+8
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-04	1	-236/+236
\|\\|
\| *	xserver xkeyboard-config mesa git update 4 Marc 2011	marha	2011-03-04	1	-41/+41
\| \|
\| *	Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵	marha	2010-07-13	1	-0/+236
\| \| \| \|	repository)
*	Renamed xkbdata.src also on trunk since the current merging of subversion ↵	marha	2010-07-13	1	-0/+236
	will loose all the changes in xkbdata.src when the directory is renamed on the source branch.