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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-06-16	1	-400/+400
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp
\| *	xserver xkeyboard-config xkbcomp git update 16 June 2011	marha	2011-06-16	1	-400/+400
\| \|
* \|	svn merge ^/branches/released .	marha	2011-02-20	32	-36/+0
\|\\|
\| *	xserver xkeyboard-config libX11 pixman mesa git update 2011	marha	2011-02-20	32	-36/+0
\| \|
\| *	Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵	marha	2010-07-13	34	-0/+5249
\| \| \| \|	repository)
*	Renamed xkbdata.src also on trunk since the current merging of subversion ↵	marha	2010-07-13	35	-0/+5267
	will loose all the changes in xkbdata.src when the directory is renamed on the source branch.