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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-06-01	1	-2562/+1734
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
\| *	mesa pixman xkeyboard-config git update 1 Jun 2011	marha	2011-06-01	1	-2562/+1734
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-05	1	-3019/+4689
\|\\|
\| *	xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011	marha	2011-04-05	1	-1418/+3088
\| \|
\| *	Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵	marha	2010-07-13	1	-0/+3019
\| \| \| \|	repository)
*	Renamed xkbdata.src also on trunk since the current merging of subversion ↵	marha	2010-07-13	1	-0/+3019
	will loose all the changes in xkbdata.src when the directory is renamed on the source branch.