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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2014-10-01	1	-48/+118
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/macros.h xorg-server/dix/registry.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xwin/Makefile.am xorg-server/hw/xwin/glx/.gitignore xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/windisplay.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprefs.c
\| *	libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014	marha	2014-09-21	1	-48/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plink revision 10233 xserver commit 28337cb14e4347e1dd7936c5393a22e042866687 xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a glproto commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0 libxtrans commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96 mesa commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f
* \|	Merge remote-tracking branch 'origin/released'	marha	2014-07-28	1	-8/+40
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/include/servermd.h
\| *	plink fontconfig libX11 libXext xserver xkeyboard-config mesa git update 28 ↵	marha	2014-07-28	1	-8/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	July 2014 xserver commit 4afedf545b673282f2e214c0e2c759c9be9b9a2a xkeyboard-config commit 9010f6c0745f472b670c22340b5bbd36e33ce37e libX11 commit 0885cad1e4a9ed57266582be320be55259c881bf libXext commit efdcbb7634501e1117d422636a0a75d7ea84b16b fontconfig commit a9e7b0494e04b3925d1bccc140ff2500cfff9618 mesa commit cc1e1da24a6c535617d9fb38858d48d8c2999e68 plink revision 10211
* \|	Merge remote-tracking branch 'origin/released'	marha	2014-07-19	1	-5/+46
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/glsl/ir.cpp xorg-server/config/config.c xorg-server/include/callback.h xorg-server/include/colormap.h xorg-server/include/cursor.h xorg-server/include/dix.h xorg-server/include/dixfont.h xorg-server/include/dixgrabs.h xorg-server/include/gc.h xorg-server/include/gcstruct.h xorg-server/include/input.h xorg-server/include/os.h xorg-server/include/pixmap.h xorg-server/include/property.h xorg-server/include/resource.h xorg-server/include/scrnintstr.h xorg-server/include/window.h xorg-server/include/xkbsrv.h xorg-server/mi/mi.h
\| *	fontconfig plink libX11 libxcb mesa git update 19 July 2014	marha	2014-07-19	1	-5/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plink revision 10207 xserver commit cfa302d6224d10860e60491333950544c4fb9b04 libxcb commit 49a61c8b459ab19c7f39e653bbb0d0339ea8f00f libX11 commit 5525e8433f93bce464412f27cffa203ea628f368 fontconfig commit 6781c6baef062eeea5b5b68e4a9c31ea6cd7539b mesa commit f6fc80734533140a69b30361fe0d4773a03515db
* \|	Merge remote-tracking branch 'origin/released'	marha	2014-04-14	1	-10164/+11140
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/plink/misc.h tools/plink/ssh.c tools/plink/sshbn.c tools/plink/winplink.c
\| *	plink: updated to revision 10170 of putty	marha	2014-04-14	1	-10163/+11139
\| \|
* \|	When writing to stderr flush immediately	marha	2012-12-04	1	-0/+1
\|/
*	Update to putty 9388	marha	2012-01-24	1	-599/+873
\|
*	plink: updated to putty revision 9080	marha	2011-01-27	1	-2/+6
\|
*	Updated to revision 9025 of putty	marha	2010-11-19	1	-46/+194
\|
*	Reintegrate tools from trunk	marha	2010-11-19	1	-0/+9737
\|
*	Remove tools again. Should have done it with svn merge --reintegrate	marha	2010-11-19	1	-9737/+0
\|
*	Copied tools directory from trunk. Here the original versions will be ↵	marha	2010-11-19	1	-0/+9737
	checked in, so that we can update them and merge the changes back in.