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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2012-06-08	686	-140930/+141036
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
\| *	Used synchronise script to update files	marha	2012-06-08	686	-140897/+141003
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-06-04	2	-1/+6
\|\\|
\| *	fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4	marha	2012-06-04	2	-1/+6
\| \| \| \| \| \| \| \|	May 2012
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-05-29	2	-29/+13
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
\| *	fontconfig libX11 mesa pixman xserver git update 29 May 2012	marha	2012-05-29	2	-29/+13
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-05-15	1	-12/+0
\|\\|
\| *	fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012	marha	2012-05-14	1	-12/+0
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-05-09	2	-2/+191
\|\\|
\| *	libX11 mesa xserver xkeyboard-config	marha	2012-05-09	2	-2/+191
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-04-30	14	-25/+48
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
\| *	fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012	marha	2012-04-30	14	-25/+48
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-04-20	3	-43/+60
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
\| *	fontconfig libX11 mesa pixman xserver git update 20 april 2012	marha	2012-04-20	3	-43/+60
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-04-16	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-03-26	4	-636/+998
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-636/+998
\| \| \| \| \| \| \| \|	23 Mar 2012
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-03-12	2	-1502/+1483
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1498/+1479
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-02-24	1	-1/+1
\|\\|
\| *	fontconfig libX11 pixman xserver git update 24 Feb 2012	marha	2012-02-24	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-02-22	4	-436/+436
\|\\|
\| *	fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012	marha	2012-02-22	4	-436/+436
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-02-13	2	-33/+33
\|\\|
\| *	libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012	marha	2012-02-13	2	-33/+33
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-02-09	1	-0/+67
\|\\|
\| *	libX11 git update 9 feb 2012	marha	2012-02-09	1	-0/+67
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-24	2	-49/+50
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/dix/grabs.c
\| *	libX11 mesa xserver git update 24 jan 2012	marha	2012-01-24	2	-49/+50
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-23	34	-2916/+3294
\|\\|
\| *	git update libX11 mesa libxcb xkeyboard-config 23 jan 2012	marha	2012-01-23	34	-2916/+3294
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-09	5	-225/+234
\|\\|
\| *	xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011	marha	2012-01-09	5	-225/+234
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2012-01-06	1	-2/+0
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
\| *	libX11 mesa pixman git update 6 jan 2012	marha	2012-01-06	1	-2/+0
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-29	1	-1/+1
\|\\|
\| *	xserver libX11 mesa xkeyboard-config git update 28 dec 2011	marha	2011-12-28	1	-1/+1
\| \|
* \|	Solved compilation error due to name conflict	marha	2011-12-23	2	-0/+8
\| \|
* \|	Synchronised files	marha	2011-12-23	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-17	1	-77/+99
\|\\|
\| *	libX11 libxtrans mesa xserver git update 17 dec 2011	marha	2011-12-17	1	-77/+99
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-12	1	-10/+42
\|\\|
\| *	libxtrans libX11 libxcb xserver mesa git update 12 dec 2011	marha	2011-12-12	1	-10/+42
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-12-08	1	-1/+1
\|\\|
\| *	git update glproto libX11 libxcb mesa xserver 8 dec 2011	marha	2011-12-08	1	-1/+1
\| \|
* \|	Solved possible build problem	marha	2011-11-14	1	-2/+0
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-14	5	-345/+350
\|\\| \| \| \| \| \| \| \| \|	Conflicts: libX11/src/util/makekeys.c
\| *	libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update	marha	2011-11-14	5	-344/+349
\| \| \| \| \| \| \| \|	14 nov 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-11-10	1	-96/+94
\|\\|