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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2012-04-16	1	-231/+232
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
\| *	libX11 xserver pixman mesa git update 16 Apr 2012	marha	2012-04-16	1	-231/+232
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-03-26	14	-5675/+5271
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/shm.c xorg-server/Xext/syncsrv.h xorg-server/Xext/xvmain.c xorg-server/Xi/exevents.c xorg-server/Xi/opendev.c xorg-server/composite/compalloc.c xorg-server/composite/compoverlay.c xorg-server/dix/colormap.c xorg-server/dix/devices.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/dix/eventconvert.c xorg-server/dix/events.c xorg-server/dix/gc.c xorg-server/dix/getevents.c xorg-server/dix/main.c xorg-server/dix/privates.c xorg-server/dix/registry.c xorg-server/dix/resource.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/fb/fb.h xorg-server/fb/fbcopy.c xorg-server/fb/fbpixmap.c xorg-server/glx/dispatch.h xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmds.c xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdricommon.c xorg-server/glx/glxdriswrast.c xorg-server/glx/glxext.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_util.c xorg-server/glx/rensize.c xorg-server/glx/single2swap.c xorg-server/glx/singlepix.c xorg-server/glx/singlepixswap.c xorg-server/glx/singlesize.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/ephyr/hostx.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/compiler.h xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glwrap.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.h xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winallpriv.c xorg-server/hw/xwin/winauth.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincmap.c xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winlayouts.h xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winregistry.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/wintrayicon.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c xorg-server/include/callback.h xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/include/os.h xorg-server/include/scrnintstr.h xorg-server/mi/micmap.c xorg-server/mi/miinitext.c xorg-server/mi/mioverlay.c xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/mi/miwindow.c xorg-server/miext/damage/damage.c xorg-server/miext/rootless/rootlessGC.c xorg-server/miext/rootless/rootlessWindow.c xorg-server/os/WaitFor.c xorg-server/os/access.c xorg-server/os/connection.c xorg-server/os/io.c xorg-server/os/log.c xorg-server/os/osinit.c xorg-server/os/utils.c xorg-server/os/xdmcp.c xorg-server/os/xprintf.c xorg-server/os/xstrans.c xorg-server/render/mipict.c xorg-server/xkb/xkbActions.c xorg-server/xkb/xkbInit.c xorg-server/xkeyboard-config/compat/default.in
\| *	libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update	marha	2012-03-23	14	-5675/+5271
\| \| \| \| \| \| \| \|	23 Mar 2012
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-13	1	-417/+420
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
\| *	libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012	marha	2012-01-13	1	-417/+420
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-16	1	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c
\| *	xserver git update 16 dec 2011	marha	2011-12-16	1	-1/+2
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-25	4	-514/+511
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-514/+511
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-27	4	-197/+279
\|\\|
\| *	libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011	marha	2011-10-26	4	-197/+279
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-05	1	-4/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+0
\| \| \| \| \| \| \| \|	update 5 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-22	2	-848/+810
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-848/+810
\| \|
* \|	Synchronised line endinge with release branch	marha	2011-09-12	4	-5891/+5891
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-28	2	-107/+1
\|\\|
\| *	xserver xkeyboard-config mesa git update 28 Apr 2011	marha	2011-04-28	2	-2534/+2428
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-14	1	-3/+9
\|\\|
\| *	server xkeyboard-config mesa git update 14 Apr 2011	marha	2011-04-14	1	-3/+9
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-05	1	-13/+12
\|\\|
\| *	xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011	marha	2011-04-05	1	-13/+12
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-30	1	-3/+0
\|\\|
\| *	xserver mesa git update 30 Mar 2011	marha	2011-03-30	1	-3/+0
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-24	1	-20/+5
\|\\|
\| *	xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011	marha	2011-03-24	1	-20/+5
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-15	5	-148/+54
\|\\|
\| *	xserver libX11 libxcb mesa git update 15 Mar 2011	marha	2011-03-15	5	-974/+880
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-10	1	-1/+1
\|\\|
\| *	xserver mesa git update 10 Mar 2011	marha	2011-03-10	1	-3394/+3394
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-04	4	-465/+269
\|\\|
\| *	xserver xkeyboard-config mesa git update 4 Marc 2011	marha	2011-03-04	4	-972/+776
\| \|
* \|	svn merge ^/branches/released .	marha	2011-01-08	2	-8/+21
\|\\|
\| *	xserver mesa libX11 xkbcomp pixman git update 8/1/2011	marha	2011-01-08	2	-8/+21
\| \|
* \|	svn merge ^/branches/released .	marha	2010-12-29	1	-2/+4
\|\\|
\| *	xserver and mesa git update 28-12-2010	marha	2010-12-28	1	-2/+4
\| \|
* \|	svn merge ^/branches/released .	marha	2010-12-12	1	-3/+5
\|\\|
\| *	xserver git update 10/12/2010	marha	2010-12-10	1	-3/+5
\| \|
* \|	svn merge ^/branches/released .	marha	2010-12-08	1	-2/+2
\|\\|
\| *	libXext xserver pixman git update 6-12-2010	marha	2010-12-06	1	-2/+2
\| \|
* \|	svn merge ^/branches/released .	marha	2010-12-01	3	-163/+159
\|\\|
\| *	xserver libX11 libxcb update 1/12/2010	marha	2010-12-01	3	-163/+159
\| \|
* \|	svn merge "^/branches/released" .	marha	2010-11-15	6	-234/+27
\|\\| \| \| \| \| \| \| \| \| \| \|	Solved mouse motion bug in new version of dix/getevents.c
\| *	xserver pixman libX11 libXext 14/11/2010	marha	2010-11-14	5	-232/+26
\| \|
* \|	svn merge ^/branches/released .	marha	2010-08-23	1	-0/+8
\|\\|
\| *	xserver git update 20/8/2010	marha	2010-08-20	1	-0/+8
\| \|
* \|	svn merge ^/branches/released .	marha	2010-06-11	8	-353/+350
\|\\|
\| *	xserver git update 11/6/2010	marha	2010-06-11	8	-353/+350
\| \|
* \|	svn merge "^/branches/released" .	marha	2010-05-20	4	-3420/+3402
\|\\|