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	-2367/+2482
\| \| \| \| \| \| \| \| \| \| \| \| \|	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	-2213/+2293
\| \| \| \| \| \| \|	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	-2247/+2588
\|
*	Merge remote-tracking branch 'origin/released'	marha	2014-11-29	1	-422/+427
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Synchronised and compiled	marha	2014-08-22	1	-691/+692
\|
*	Compiled and synchronised	marha	2014-08-22	1	-2010/+2019
\|
*	Synchronised files	marha	2014-07-28	1	-1776/+1786
\|
*	Synchronised files	marha	2014-05-11	1	-2144/+2268
\|
*	Merge remote-tracking branch 'origin/released'	marha	2014-03-09	1	-2029/+2013
\| \| \| \| \| \| \| \| \|	* 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	-4884/+5104
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	-605/+615
\|
*	Synchronised files and updated mesa project file	marha	2014-01-27	1	-2061/+2121
\|
*	Solved compile problems due to latest merge	marha	2013-12-22	1	-6510/+6525
\|
*	Synchronised files	marha	2013-11-26	1	-1913/+1933
\|
*	Solved compilation and run-time problems after latest merge	marha	2013-11-08	1	-1688/+1718
\|
*	Solved compilation and link problems after last merge	marha	2013-11-08	1	-1828/+1873
\|
*	Updated mesa project and synchronised files	marha	2013-10-01	1	-1707/+1762
\|
*	Synchronised files	marha	2013-09-05	1	-1813/+1863
\|
*	Synchronised file	marha	2013-07-22	1	-1389/+1397
\|
*	Synchronised mesa and glx	marha	2013-06-05	1	-0/+6302