<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/gl, branch master</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=master</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2015-04-30T21:29:47+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-04-30T21:29:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-30T21:26:47+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=055e5645a789d2822d3c4e5a3bc81ff6a969ff31'/>
<id>urn:sha1:055e5645a789d2822d3c4e5a3bc81ff6a969ff31</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-04-20T20:42:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-20T20:42:55+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=934184bfecd402aae891b8740d788b486aa7269f'/>
<id>urn:sha1:934184bfecd402aae891b8740d788b486aa7269f</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/dlopen.h
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/randr/rrxinerama.c
</content>
</entry>
<entry>
<title>Merged origin/release (checked in because wanted to merge new stuff)</title>
<updated>2015-02-22T20:39:56+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-02-22T20:39:56+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=462f18c7b25fe3e467f837647d07ab0a78aa8d2b'/>
<id>urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-10-01T18:12:35+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-10-01T18:12:35+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=19b4b68b35a047a83bd291ee8debac1adb0e946c'/>
<id>urn:sha1:19b4b68b35a047a83bd291ee8debac1adb0e946c</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/main/macros.h
	xorg-server/dix/registry.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xwin/Makefile.am
	xorg-server/hw/xwin/glx/.gitignore
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/windisplay.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winprefs.c
</content>
</entry>
<entry>
<title>libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014</title>
<updated>2014-09-21T16:11:28+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-09-21T16:11:28+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=438af0c7d4bf60b408b259c88205ff2193195466'/>
<id>urn:sha1:438af0c7d4bf60b408b259c88205ff2193195466</id>
<content type='text'>
plink revision 10233
xserver          commit 28337cb14e4347e1dd7936c5393a22e042866687
xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a
glproto          commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0
libxtrans        commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
mesa             commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f
</content>
</entry>
<entry>
<title>Synchronised and compiled</title>
<updated>2014-08-22T20:27:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-08-22T20:27:13+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=4469aefef31cd682683944aa91e0b3edc0042fa4'/>
<id>urn:sha1:4469aefef31cd682683944aa91e0b3edc0042fa4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Compiled and synchronised</title>
<updated>2014-08-22T19:51:08+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-08-22T19:51:08+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=bcb354180f20f0c410a77bd32cbf2c1e799632d5'/>
<id>urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Increased to version 1.15.2.0</title>
<updated>2014-07-05T14:42:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-05T14:42:13+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=0fc6b05dc947d92381453fbe0ce690196719da86'/>
<id>urn:sha1:0fc6b05dc947d92381453fbe0ce690196719da86</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files and solved compilaton errors</title>
<updated>2014-07-01T12:23:00+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-01T12:23:00+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=3095a03ec3cb1f05b49362327d10a767299d7635'/>
<id>urn:sha1:3095a03ec3cb1f05b49362327d10a767299d7635</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-05-11T19:02:05+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-11T19:02:05+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=0b89941658d6117d17555ee28c6e5d7715673705'/>
<id>urn:sha1:0b89941658d6117d17555ee28c6e5d7715673705</id>
<content type='text'>
</content>
</entry>
</feed>
