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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2012-06-15	1	-23/+38
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
\| *	fontconfig mesa pixman xserver git update 15 juni 2012	marha	2012-06-15	1	-23/+38
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-05-21	1	-8/+4
\|\\|
\| *	fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012	marha	2012-05-21	1	-8/+4
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-05-02	1	-0/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/os/connection.c
\| *	fontconfig mesa xserver xkeyboard-config git update 2 May 2012	marha	2012-05-02	1	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-03-26	1	-745/+737
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-745/+737
\| \| \| \| \| \| \| \|	23 Mar 2012
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-23	1	-1/+86
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
\| *	git mesa pixman xserver xkeyboard-config update 24 dec 2011	marha	2011-12-23	1	-1/+86
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-16	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-12	1	-0/+3
\|\\|
\| *	libxtrans libX11 libxcb xserver mesa git update 12 dec 2011	marha	2011-12-12	1	-0/+3
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-25	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-04	1	-4/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+10
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-27	1	-1/+1
\|\\|
\| *	libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011	marha	2011-10-26	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-05	1	-0/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+12
\| \| \| \| \| \| \| \|	update 5 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-27	1	-13/+20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-13/+20
\| \|
* \|	Synchronised line endinge with release branch	marha	2011-09-12	1	-2630/+2630
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-05-29	1	-9/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-9/+0
\| \|
* \|	merge ^/branches/released .	marha	2011-05-16	1	-6/+4
\|\\|
\| *	xserver xkeyboar-config mesa git update 16 May 2011	marha	2011-05-16	1	-6/+4
\| \|
* \|	Solved run-time exception in debug because value was larget then a s8	marha	2011-05-05	1	-1/+1
\| \|
* \|	svn merge ^/branches/released .	marha	2011-04-27	1	-11/+38
\|\\|
\| *	xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011	marha	2011-04-27	1	-11/+38
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-28	1	-28/+4
\|\\|
\| *	xserver xkeyboard-config mesa git update 28 Mar 2011	marha	2011-03-28	1	-2630/+2606
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-15	1	-0/+2
\|\\|
\| *	xserver libX11 libxcb mesa git update 15 Mar 2011	marha	2011-03-15	1	-2628/+2630
\| \|
* \|	svn merge ^/branches/released .	marha	2011-03-04	1	-55/+79
\|\\|
\| *	xserver xkeyboard-config mesa git update 4 Marc 2011	marha	2011-03-04	1	-55/+79
\| \|
* \|	svn merge ^/branches/released .	marha	2011-02-28	1	-6/+8
\|\\|
\| *	xserver libX11 Xextproto mesa Git update 28 Feb 2011	marha	2011-02-28	1	-2602/+2604
\| \|
* \|	svn merge ^/branches/released .	marha	2010-12-12	1	-6/+11
\|\\|
\| *	xserver git update 10/12/2010	marha	2010-12-10	1	-6/+11
\| \|
* \|	svn merge "^/branches/released" .	marha	2010-11-15	1	-18/+32
\|\\| \| \| \| \| \| \| \| \| \| \|	Solved mouse motion bug in new version of dix/getevents.c
\| *	xserver pixman libX11 libXext 14/11/2010	marha	2010-11-14	1	-18/+32
\| \|
* \|	svn merge ^/branches/released .	marha	2010-10-14	1	-1/+1
\|\\|
\| *	xserver git update 14/10/2010	marha	2010-10-14	1	-1/+1
\| \|
* \|	svn merge ^/branches/released .	marha	2010-09-11	1	-9/+14
\|\\|
\| *	xserver git update 11/9/2010	marha	2010-09-11	1	-9/+14
\| \|
* \|	svn merge ^/branches/released .	marha	2010-08-18	1	-6/+2
\|\\|
\| *	libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010	marha	2010-08-18	1	-6/+2
\| \|