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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-11-04	78	-10693/+8923
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	78	-10686/+8916
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-28	6	-946/+979
\|\\|
\| *	mesa git update 28 okt 2011	marha	2011-10-28	6	-946/+979
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-27	45	-451/+952
\|\\|
\| *	mesa git update 27 okt 2011	marha	2011-10-27	7	-61/+99
\| \|
\| *	libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011	marha	2011-10-26	43	-390/+853
\| \|
* \|	Removed useless code	marha	2011-10-27	1	-2/+0
\| \|
* \|	Solved link problems	marha	2011-10-19	1	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-19	45	-1605/+1382
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/include/os.h
\| *	libX11 libXext libXft mesa libxcb mkfontscale pixman xserver	marha	2011-10-19	45	-1605/+1382
\| \| \| \| \| \| \| \|	xkeyboard-config git update 19 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-10	34	-513/+888
\|\\|
\| *	fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011	marha	2011-10-10	34	-513/+888
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-06	13	-519/+611
\|\\|
\| *	upgraded to inputproto-2.1.99.1	marha	2011-10-06	13	-519/+611
\| \| \| \| \| \| \| \|	xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-10-05	118	-10639/+11410
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	118	-10639/+11410
\| \| \| \| \| \| \| \|	update 5 oct 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-30	14	-286/+92
\|\\| \| \| \| \| \| \| \| \|	Conflicts: openssl/Makefile
\| *	mesa xkeyboard-config git update 30 sep 2011	marha	2011-09-30	14	-286/+92
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-29	9	-13/+84
\|\\|
\| *	xwininfo libXft mesa git update 29 sep 2011	marha	2011-09-29	9	-13/+84
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-28	6	-129/+197
\|\\|
\| *	mesa pixman xkeyboard-config git update 28 sep 2011	marha	2011-09-28	6	-129/+197
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-27	9	-391/+314
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-391/+314
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-26	20	-380/+404
\|\\| \| \| \| \| \| \| \| \|	Conflicts: libXmu/src/CmapAlloc.c
\| *	fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011	marha	2011-09-26	20	-380/+404
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-22	36	-4099/+4047
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	36	-4099/+4047
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-21	1	-0/+119
\|\\|
\| *	libxtrans libX11 libXext mesa git update 21 sep 2011	marha	2011-09-21	1	-0/+119
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-20	27	-4761/+3643
\|\\|
\| *	libX11 libxtrans mesa git update 20 sep 2011	marha	2011-09-20	27	-4761/+3643
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-19	31	-2740/+2873
\|\\| \| \| \| \| \| \| \| \|	Conflicts: libfontenc/src/fontenc.c
\| *	xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc	marha	2011-09-19	31	-2740/+2873
\| \| \| \| \| \| \| \|	mesa git update 19 sept 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-16	3	-5/+19
\|\\|
\| *	git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011	marha	2011-09-16	3	-5/+19
\| \| \| \| \| \| \| \|	X11/extensions: removed files that are in multiple extension modules
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-15	16	-1964/+1985
\|\\|
\| *	libxtrans libXmu libXext mesa pixman git update 15 sept 2011	marha	2011-09-15	16	-1964/+1985
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-14	3	-5/+27
\|\\|
\| *	mesa git update 14 sep 2011	marha	2011-09-14	3	-5/+27
\| \|
* \|	Synchronised line endinge with release branch	marha	2011-09-12	139	-131014/+131014
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-12	16	-3329/+3276
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h
\| *	git update 12 sep 2011	marha	2011-09-12	16	-3327/+3274
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-09	14	-215/+2289
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/scons/gallium.py mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_variable.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak
\| *	mesa git update 9 sep 2011	marha	2011-09-09	14	-215/+2289
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-08	31	-5932/+4701
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/docs/relnotes.html mesalib/scons/gallium.py mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/colortab.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/get.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/texstate.c mesalib/src/mesa/swrast/s_drawpix.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h
\| *	mesa git update 8 sep 2011	marha	2011-09-08	31	-5929/+4701
\| \|
* \|	solved compile error	marha	2011-09-06	1	-0/+3
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-09-06	13	-6510/+7942
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/docs/GL3.txt mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h mesalib/src/mesa/vbo/vbo_save_api.c