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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Synchronised line endinge with release branch	marha	2011-09-12	1	-521/+521
\|
*	Merge remote-tracking branch 'origin/released'	marha	2011-08-01	1	-7/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv
\| *	mesa xserver pixman xkeyboard-config git update 1 aug 2011	marha	2011-08-01	1	-7/+7
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-27	1	-1/+1
\|\\|
\| *	xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011	marha	2011-04-27	1	-1/+1
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-15	1	-9/+9
\|\\|
\| *	xserver xkeyboard-config libX11 mesa git update 15 April 2011	marha	2011-04-15	1	-9/+9
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-13	1	-66/+460
\|\\|
\| *	xkeyboard-config libxcb libX11 git update 13 April 2011	marha	2011-04-13	1	-127/+521
\|/
*	xserver xkeyboard-config libX11 pixman mesa git update 2011	marha	2011-02-20	1	-129/+127
\|
*	Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵	marha	2010-07-13	1	-0/+129
	repository)