VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0 2011-11-04T08:28:39+00:00 2011-11-04T08:28:39+00:00 marha marha@users.sourceforge.net 2011-11-04T08:28:39+00:00 urn:sha1:23e2767dc3e6b8891d4b55b711c70c6bc85a6f85 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 2011-11-04T07:57:20+00:00 marha marha@users.sourceforge.net 2011-11-04T07:57:20+00:00 urn:sha1:02f377d5e2dd18537d0807ad63675a0970b5a37d 2011-09-22T13:42:49+00:00 marha marha@users.sourceforge.net 2011-09-22T13:42:49+00:00 urn:sha1:46d4f558531910ca1f3297da85b99334d6de2921 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 2011-09-22T13:20:09+00:00 marha marha@users.sourceforge.net 2011-09-22T13:20:09+00:00 urn:sha1:c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 2011-09-12T09:27:51+00:00 marha marha@users.sourceforge.net 2011-09-12T09:27:51+00:00 urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 2011-08-01T07:13:47+00:00 marha marha@users.sourceforge.net 2011-08-01T07:13:47+00:00 urn:sha1:6730a76afc49a80573b2e582085086c2956fe96d Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv 2011-08-01T07:05:15+00:00 marha marha@users.sourceforge.net 2011-08-01T07:05:15+00:00 urn:sha1:f87ad0cdc41af88f134475ab50b0d604004d9cdc 2011-07-14T14:15:03+00:00 marha marha@users.sourceforge.net 2011-07-14T14:15:03+00:00 urn:sha1:31ee9c57db79281e122d3c4acb0f8eae07f4449f 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 2011-07-14T07:02:09+00:00 marha marha@users.sourceforge.net 2011-07-14T07:02:09+00:00 urn:sha1:d03a5f20114203fd00e0004659fd2617f4c03a32 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