VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=master 2015-06-15T19:36:28+00:00 2015-06-15T19:36:28+00:00 marha marha@users.sourceforge.net 2015-06-15T19:36:28+00:00 urn:sha1:008a8d8051786badb83e455bd9281103ba9a6470 Conflicts: freetype/src/base/ftfntfmt.c freetype/src/cache/ftcimage.c freetype/src/cid/cidriver.c freetype/src/truetype/ttdriver.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c openssl/Makefile 2015-05-03T21:02:38+00:00 marha marha@users.sourceforge.net 2015-05-03T21:02:38+00:00 urn:sha1:2e00f3764228cfc91180bbe9375a8d85e0e65a5b 2015-03-05T22:42:09+00:00 marha marha@users.sourceforge.net 2015-03-05T22:40:39+00:00 urn:sha1:c646056120fe14e4c4ccf81bac5d78d61225a8e8 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/queryobj.c 2015-02-24T06:44:41+00:00 marha marha@users.sourceforge.net 2015-02-24T06:44:41+00:00 urn:sha1:f64e43decd0fdac938feddeedee255dc4508aaa5 Conflicts: apps/xcalc/math.c freetype/src/base/ftbdf.c freetype/src/base/fttype1.c freetype/src/pfr/pfrobjs.c mesalib/src/mesa/main/.gitignore openssl/Configure openssl/Makefile openssl/crypto/cryptlib.c openssl/crypto/opensslconf.h openssl/test/v3nametest.c openssl/util/mk1mf.pl openssl/util/pl/VC-32.pl xorg-server/Xi/xipassivegrab.c xorg-server/dix/dispatch.c xorg-server/dix/getevents.c xorg-server/glx/glxcmds.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winprocarg.c xorg-server/render/render.c 2014-11-29T15:13:30+00:00 marha marha@users.sourceforge.net 2014-11-29T15:13:30+00:00 urn:sha1:7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glshim.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/winwndproc.c xorg-server/mi/miarc.c xorg-server/os/connection.c 2014-10-13T19:52:30+00:00 marha marha@users.sourceforge.net 2014-10-13T19:52:30+00:00 urn:sha1:8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e 2014-10-12T19:38:35+00:00 marha marha@users.sourceforge.net 2014-10-12T19:11:32+00:00 urn:sha1:1a83b8e49a75e2dab63805de25e384e0e38c27ed Conflicts: mesalib/src/glsl/glsl_symbol_table.h mesalib/src/mesa/drivers/common/meta_blit.c xorg-server/dix/dispatch.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/mi/miexpose.c 2014-10-01T21:12:13+00:00 marha marha@users.sourceforge.net 2014-10-01T21:12:13+00:00 urn:sha1:88236adfe3eb41b8368b4c9ecf3e09a7199dc474 Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winglobals.c 2014-10-01T18:28:30+00:00 marha marha@users.sourceforge.net 2014-10-01T18:28:30+00:00 urn:sha1:e4086b3defb6186a2fb8a5845968c97e613fb493 2014-08-22T19:51:08+00:00 marha marha@users.sourceforge.net 2014-08-22T19:51:08+00:00 urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5