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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/released'	marha	2011-08-05	14	-2123/+7436
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/texcompress_rgtc_tmp.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_print.c mesalib/src/mesa/program/prog_statevars.c mesalib/src/mesa/program/program.c mesalib/src/mesa/program/program_parse.y mesalib/src/mesa/program/program_parser.h mesalib/src/mesa/program/sampler.cpp mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/vbo/vbo_exec_array.c pixman/pixman/pixman-arm-neon-asm.S pixman/pixman/pixman-arm-neon.c
\| *	mesa pixman git update 5 aug 2011	marha	2011-08-05	14	-2123/+7436
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-29	1	-3/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libX11/configure.ac mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/texparam.c pixman/pixman/pixman-arm-neon-asm.S
\| *	libX11 mesa pixman git update 29 jul 2011	marha	2011-07-29	1	-3/+3
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-27	1	-1/+10
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/state_tracker/st_extensions.c
\| *	mesa git update 27 juni 2011	marha	2011-07-27	1	-1/+10
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-22	2	-84/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/linker.cpp mesalib/src/glsl/s_expression.cpp mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c
\| *	mesa git update 22 July 2011	marha	2011-07-22	2	-84/+1
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-18	1	-33/+31
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
\| *	pixman git update 18 July 2011	marha	2011-07-18	1	-33/+31
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-14	3	-179/+192
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c
\| *	mesa xserver git update 14 july 2011	marha	2011-07-14	3	-179/+192
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-12	1	-56/+59
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
\| *	mesa git update 12 July 2011	marha	2011-07-12	1	-56/+59
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-11	6	-17/+172
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/docs/GL3.txt mesalib/src/glsl/linker.cpp mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/readpix.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/samplerobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/texenv.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_cb_clear.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_extensions.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/swrast/s_readpix.c
\| *	mesa update 11 july 2011	marha	2011-07-11	6	-17/+172
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-07-01	6	-122/+145
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
\| *	xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli	marha	2011-07-01	6	-122/+145
\| \| \| \| \| \| \| \|	2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-27	3	-6/+27
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
\| *	xwininfo fontconfig mesa pixman git update 27 June 2011	marha	2011-06-27	3	-6/+27
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-23	5	-26/+130
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
\| *	libX11 mesa pixman xserver git update 23 June 2011	marha	2011-06-23	5	-26/+130
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-22	1	-923/+927
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: xkbcomp/xkbcomp.c xkbcomp/xkbcomp.h xkbcomp/xkbparse.y
\| *	mesa xkbcomp git update 22 June 2011	marha	2011-06-22	1	-923/+927
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-21	1	-3/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
\| *	fontconfig mesa git update 21 June 2011	marha	2011-06-21	1	-3/+3
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-20	1	-8/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
\| *	libX11 xserver mesa git update 20 June 2011	marha	2011-06-20	1	-8/+8
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-15	7	-984/+989
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
\| *	mesa xserver git update 15 June 2011	marha	2011-06-15	7	-984/+989
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-13	1	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
\| *	libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵	marha	2011-06-13	1	-1/+2
\| \| \| \| \| \| \| \|	update 13 Jun 2011
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-09	2	-5/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
\| *	mesa xkbcomp xkeyboard-config git update 9 Jun 2011	marha	2011-06-09	2	-5/+6
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-07	1	-1/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: xorg-server/randr/rrcrtc.c
\| *	git update xserver mesa 7 Jun 2011	marha	2011-06-07	1	-1/+2
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-06-03	1	-0/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile 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/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
\| *	xserver xkeyboard-config mesa git update 3 Jun 2011	marha	2011-06-03	1	-0/+8
\| \|
\| *	mesa pixman xkeyboard-config git update 1 Jun 2011	marha	2011-06-01	8	-782/+839
\| \|
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-05-30	8	-782/+839
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c
\| * \|	mesa git update 30 May 2011	marha	2011-05-30	8	-782/+839
\| \|/
* \|	Merge remote-tracking branch 'origin/released'	marha	2011-05-29	7	-816/+824
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-816/+824
\| \|
* \|	merge ^/branches/released .	marha	2011-05-25	1	-905/+551
\|\\|
\| *	xkeyboard-config libX11 pixman mesa git update 25 May 2011	marha	2011-05-25	1	-1692/+1338
\| \|
* \|	svn merge ^/branches/released .	marha	2011-05-22	5	-11/+15
\|\\|
\| *	xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵	marha	2011-05-22	5	-649/+653
\| \| \| \| \| \| \| \|	May 2011
* \|	merge ^/branches/released .	marha	2011-05-16	6	-157/+233
\|\\|
\| *	xserver xkeyboar-config mesa git update 16 May 2011	marha	2011-05-16	6	-433/+509
\| \|
* \|	svn merge ^/branches/released .	marha	2011-05-09	2	-0/+11
\|\\|