VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.1 2011-07-15T09:32:48+00:00 2011-07-15T09:32:48+00:00 marha marha@users.sourceforge.net 2011-07-15T09:32:48+00:00 urn:sha1:3fbadc13acf6beb4a2497970367e2c2c1b6039ca Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c 2011-07-15T09:25:17+00:00 marha marha@users.sourceforge.net 2011-07-15T09:25:17+00:00 urn:sha1:2ce12f084113a0097fa1a0d67e2f8fe1ab70092b 2011-07-04T12:32:38+00:00 marha marha@users.sourceforge.net 2011-07-04T12:32:38+00:00 urn:sha1:8233b83eae0a8b9219bbd46a98710e94f3f58ecd 2011-07-04T12:26:33+00:00 marha marha@users.sourceforge.net 2011-07-04T12:26:33+00:00 urn:sha1:7cc339a490eac34596e97788c3b0092d58459cf6 Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c 2011-07-04T12:21:49+00:00 marha marha@users.sourceforge.net 2011-07-04T12:21:49+00:00 urn:sha1:5c671fd7f8198bed2fc32b33b81d1081f1486ed9 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-15T15:01:46+00:00 marha marha@users.sourceforge.net 2011-06-15T15:01:46+00:00 urn:sha1:fa8048de701d8dfd0c66983733deb5fcb1a108c9 2011-06-15T14:59:33+00:00 marha marha@users.sourceforge.net 2011-06-15T14:59:33+00:00 urn:sha1:6cba1e57f303d9b90add32c5e942375826fb1ab2 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 2011-06-15T14:50:54+00:00 marha marha@users.sourceforge.net 2011-06-15T14:50:54+00:00 urn:sha1:0e661faf8cf2e3460b5e2389414f99c035ad4d6a