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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-12-12	2	-1756/+1760
\|\
\| *	libxtrans libX11 libxcb xserver mesa git update 12 dec 2011	marha	2011-12-12	2	-1756/+1760
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-08	5	-658/+668
\|\\|
\| *	git update glproto libX11 libxcb mesa xserver 8 dec 2011	marha	2011-12-08	5	-658/+668
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-05	1	-2/+0
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/dix/dispatch.c
\| *	xserver xkeyboard-config mesa git update 5 dec 2011	marha	2011-12-05	1	-2/+0
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-25	41	-4548/+4466
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
\| *	mesa xserver pixman git update 25 nov 2011	marha	2011-11-25	41	-4548/+4466
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-21	11	-1902/+1917
\|\\|
\| *	xserver xkeyboard-config mesa git update 21 nov 2011	marha	2011-11-21	11	-1902/+1917
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-17	4	-2/+7
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/swrast/s_readpix.c
\| *	xserver mesa git update 17 nov 2011	marha	2011-11-17	4	-2/+7
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-07	1	-1/+4
\|\\| \| \| \| \| \| \| \| \|	Conflicts: pixman/pixman/pixman-mmx.c
\| *	xserver pixman mesa git update 7 nov 2011	marha	2011-11-07	1	-1/+4
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-04	16	-2314/+2241
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
\| *	xserver pixman mesa git update 4 nov 2011	marha	2011-11-04	16	-2314/+2241
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-27	14	-1183/+1152
\|\\|
\| *	libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011	marha	2011-10-26	14	-1183/+1152
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-19	54	-8023/+7298
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/include/os.h
\| *	libX11 libXext libXft mesa libxcb mkfontscale pixman xserver	marha	2011-10-19	54	-8023/+7298
\| \| \| \| \| \| \| \|	xkeyboard-config git update 19 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-05	22	-6230/+6194
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
\| *	mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵	marha	2011-10-05	22	-6230/+6194
\| \| \| \| \| \| \| \|	update 5 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-27	16	-787/+822
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
\| *	libX11 pixman mesa xserver git update 27 sep 2011	marha	2011-09-27	16	-787/+822
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-22	28	-6250/+6348
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
\| *	libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011	marha	2011-09-22	28	-6250/+6348
\| \|
* \|	Synchronised line endinge with release branch	marha	2011-09-12	31	-30012/+30012
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-08-01	8	-144/+170
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-144/+170
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-04	7	-822/+839
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
\| *	xserver mesa git update 4 July 2011	marha	2011-07-04	7	-822/+839
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-01	7	-1635/+1616
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-1635/+1616
\| \| \| \| \| \| \| \|	2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-23	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
\| *	libX11 mesa pixman xserver git update 23 June 2011	marha	2011-06-23	1	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-05-29	6	-1215/+1269
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
\| *	libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011	marha	2011-05-29	6	-1215/+1269
\| \|
* \|	merge ^/branches/released .	marha	2011-05-24	1	-1/+1
\|\\|
\| *	xserver mesa git update 24 May 2011	marha	2011-05-24	1	-1/+1
\| \|
* \|	svn merge ^/branches/released .	marha	2011-05-22	1	-556/+554
\|\\|
\| *	xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵	marha	2011-05-22	1	-556/+554
\| \| \| \| \| \| \| \|	May 2011
* \|	merge ^/branches/released .	marha	2011-05-16	13	-9628/+9583
\|\\|
\| *	xserver xkeyboar-config mesa git update 16 May 2011	marha	2011-05-16	13	-9593/+9548
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-30	1	-68/+68
\|\\|
\| *	xserver mesa xkeyboard-config git update 30 Apr 2011	marha	2011-04-30	1	-68/+68
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-28	5	-6/+0
\|\\|
\| *	xserver xkeyboard-config mesa git update 28 Apr 2011	marha	2011-04-28	5	-3520/+3514
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-27	4	-809/+808
\|\\|
\| *	xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011	marha	2011-04-27	4	-1105/+1104
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-15	1	-9/+13
\|\\|