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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2015-04-20	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/dlopen.h xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winshaddd.c xorg-server/randr/rrxinerama.c
*	Merge remote-tracking branch 'origin/released'	marha	2015-03-22	1	-0/+16
\| \| \| \| \| \| \|	Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c
*	Merged origin/release (checked in because wanted to merge new stuff)	marha	2015-02-22	1	-0/+68
\|
*	Merge remote-tracking branch 'origin/released'	marha	2014-11-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winmisc.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/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwindow.c
*	Compiled and synchronised	marha	2014-08-22	1	-0/+1
\|
*	Synchronised files	marha	2014-07-28	1	-0/+2
\|
*	Synchronised files	marha	2014-05-11	1	-0/+16
\|
*	Merge remote-tracking branch 'origin/released'	marha	2014-03-09	1	-4/+0
\| \| \| \| \| \| \| \| \|	* origin/released: fontconfig mesa xserver git update 9 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h xorg-server/hw/kdrive/ephyr/hostx.c
*	Merge remote-tracking branch 'origin/released'	marha	2014-03-04	1	-1/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/released: libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glthread.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/main/bufferobj.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/winmultiwindowwm.c
*	Synchronised files and added missing files in mesa project	marha	2014-02-10	1	-0/+2
\|
*	Synchronised files and updated mesa project file	marha	2014-01-27	1	-0/+12
\|
*	Solved compile problems due to latest merge	marha	2013-12-22	1	-0/+1120