<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/composite, branch 1.11.2.0</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2011-10-27T06:37:52+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-10-27T06:37:52+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-10-27T06:37:52+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=2a9be4af293f20fa33cc34fbc3b72e2235d91090'/>
<id>urn:sha1:2a9be4af293f20fa33cc34fbc3b72e2235d91090</id>
<content type='text'>
</content>
</entry>
<entry>
<title>libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011</title>
<updated>2011-10-26T08:58:41+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-10-26T08:58:41+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=4f005bade376d15ee60e90ca45a831aff9725087'/>
<id>urn:sha1:4f005bade376d15ee60e90ca45a831aff9725087</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-09-22T13:42:49+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-22T13:42:49+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=46d4f558531910ca1f3297da85b99334d6de2921'/>
<id>urn:sha1:46d4f558531910ca1f3297da85b99334d6de2921</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011</title>
<updated>2011-09-22T13:20:09+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-22T13:20:09+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983'/>
<id>urn:sha1:c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised line endinge with release branch</title>
<updated>2011-09-12T09:27:51+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-12T09:27:51+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0'/>
<id>urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-08-04T14:54:51+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-08-04T14:54:51+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=23cc74efd16feb2676978b9919a8510ed7804ed9'/>
<id>urn:sha1:23cc74efd16feb2676978b9919a8510ed7804ed9</id>
<content type='text'>
Conflicts:
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	xorg-server/composite/compalloc.c
	xorg-server/configure.ac
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/bundle/Makefile.am
	xorg-server/hw/xquartz/xpr/xprFrame.c
	xorg-server/include/windowstr.h
</content>
</entry>
<entry>
<title>randrproto mesa xserver git update 4 aug 2011</title>
<updated>2011-08-04T14:44:35+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-08-04T14:44:35+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=9b009a8bdb31d08e3d07f68416373b9aa6f85724'/>
<id>urn:sha1:9b009a8bdb31d08e3d07f68416373b9aa6f85724</id>
<content type='text'>
</content>
</entry>
<entry>
<title>merge ^/branches/released .</title>
<updated>2011-05-16T09:49:27+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-16T09:49:27+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=ab5c2d2c78273ccdc7c9734bcba482a33fcf9652'/>
<id>urn:sha1:ab5c2d2c78273ccdc7c9734bcba482a33fcf9652</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xserver xkeyboar-config mesa git update 16 May 2011</title>
<updated>2011-05-16T08:06:12+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-16T08:06:12+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=08cbf3b50bfe713044f36b363c73768cd042f13c'/>
<id>urn:sha1:08cbf3b50bfe713044f36b363c73768cd042f13c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2011-04-27T15:56:59+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-27T15:56:59+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=100633b3e7619842f345cb7603b0db6b5761dd11'/>
<id>urn:sha1:100633b3e7619842f345cb7603b0db6b5761dd11</id>
<content type='text'>
</content>
</entry>
</feed>
