vcxsrv/include, branch master VcXsrv Windows X Server (X2Go/Arctica Builds) https://openid.arctica-project.org/vcxsrv/atom?h=master 2015-06-15T19:36:28+00:00 Merge remote-tracking branch 'origin/released' 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 Merge remote-tracking branch 'origin/released' 2015-05-26T17:43:34+00:00 marha marha@users.sourceforge.net 2015-05-26T17:43:34+00:00 urn:sha1:912e881bec8b16f2331225960645c3bdf5a8ba2d Conflicts: mesalib/src/mapi/glapi/glapi_priv.h mesalib/src/mesa/drivers/dri/swrast/swrast.c xorg-server/dix/dispatch.c xorg-server/os/utils.c xorg-server/record/record.c Increased version to 1.17.0.0 2015-04-30T21:45:25+00:00 marha marha@users.sourceforge.net 2015-04-30T21:45:25+00:00 urn:sha1:18a929ea41cc85fddd6e4fee6aa6aa4234ce29f1 Merged origin/release (checked in because wanted to merge new stuff) 2015-02-22T20:39:56+00:00 marha marha@users.sourceforge.net 2015-02-22T20:39:56+00:00 urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b Increased version to 1.16.2.0 2014-11-30T13:33:32+00:00 marha marha@users.sourceforge.net 2014-11-30T13:33:32+00:00 urn:sha1:1ad4bd867834180639568d521172f788e772b4a1 Upgraded version number to 1.16.1.0 2014-10-12T19:52:37+00:00 marha marha@users.sourceforge.net 2014-10-12T19:52:37+00:00 urn:sha1:98249a0647355198508b27a58ed255bcf206dc62 Added release note Solved errors trying to listen on local 2014-10-02T09:50:57+00:00 marha marha@users.sourceforge.net 2014-10-02T09:50:34+00:00 urn:sha1:2e7986ae025903b95bff8f58088ed428409cccad Merge remote-tracking branch 'origin/released' 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 Compiled and synchronised 2014-08-22T19:51:08+00:00 marha marha@users.sourceforge.net 2014-08-22T19:51:08+00:00 urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5 Increased to version 1.15.2.0 2014-07-05T14:42:13+00:00 marha marha@users.sourceforge.net 2014-07-05T14:42:13+00:00 urn:sha1:0fc6b05dc947d92381453fbe0ce690196719da86