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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2012-03-12	3	-69/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
\| *	xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012	marha	2012-03-12	3	-69/+2
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-20	1	-6/+9
\|\\|
\| *	xserver xkeyboard-config git update 20 jan 2012	marha	2012-01-20	1	-6/+9
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-01	1	-56/+63
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
\| *	xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli	marha	2011-07-01	1	-56/+63
\| \| \| \| \| \| \| \|	2011
* \|	svn merge ^/branches/released .	marha	2011-02-20	16	-961/+913
\|\\|
\| *	xserver xkeyboard-config libX11 pixman mesa git update 2011	marha	2011-02-20	16	-973/+925
\| \|
* \|	svn merge ^/branches/released .	marha	2011-01-11	3	-0/+4
\|\\|
\| *	xkeyboard-config git update 11 jan 2011	marha	2011-01-11	3	-0/+4
\| \|
\| *	Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵	marha	2010-07-13	22	-0/+1098
\| \| \| \|	repository)
*	Renamed xkbdata.src also on trunk since the current merging of subversion ↵	marha	2010-07-13	23	-0/+1118
	will loose all the changes in xkbdata.src when the directory is renamed on the source branch.