VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.1 2011-07-01T14:49:54+00:00 2011-07-01T14:49:54+00:00 marha marha@users.sourceforge.net 2011-07-01T14:49:54+00:00 urn:sha1:3bbcbc59b6d98f09b26f39d6208faec76cc6aa3e 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 2011-07-01T12:21:21+00:00 marha marha@users.sourceforge.net 2011-07-01T12:21:21+00:00 urn:sha1:d9f970a847e1af706f07560ef163b229bb592307 2011 2011-06-16T06:20:46+00:00 marha marha@users.sourceforge.net 2011-06-16T06:20:46+00:00 urn:sha1:35d058b84797ad0b71722195146a948a277dff25 Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp 2011-06-16T06:06:24+00:00 marha marha@users.sourceforge.net 2011-06-16T06:06:24+00:00 urn:sha1:26686c98bac306ee4e6502850e2dc8afbe4a496a 2011-06-14T06:14:45+00:00 marha marha@users.sourceforge.net 2011-06-14T06:14:45+00:00 urn:sha1:6b441c10eeb02569204ff50ba8c3b739037b8141 Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in 2011-06-14T06:12:46+00:00 marha marha@users.sourceforge.net 2011-06-14T06:12:46+00:00 urn:sha1:4d74e36f359d22b50302c82a922b79ac24dd3e23 2011-06-13T17:59:46+00:00 marha marha@users.sourceforge.net 2011-06-13T17:59:46+00:00 urn:sha1:0d495843cebea4ae94a3138db2bf51da80a16391 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 2011-06-13T17:54:55+00:00 marha marha@users.sourceforge.net 2011-06-13T17:54:55+00:00 urn:sha1:f4babb3a422e27cd33fba36f7a21eb67b7dee25d 2011-06-10T08:26:07+00:00 marha marha@users.sourceforge.net 2011-06-10T08:26:07+00:00 urn:sha1:01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am 2011-06-10T08:02:09+00:00 marha marha@users.sourceforge.net 2011-06-10T08:02:09+00:00 urn:sha1:ee6b5ca3b101697d067675efa68f0e603cd61ffa