<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/miext/sync/makefile, branch bugfix/bug3</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2013-12-22T12:16:58+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-12-22T12:16:58+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-12-22T12:12:15+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=1d03b6f684ab1ea6772f00058605a9ebb2910628'/>
<id>urn:sha1:1d03b6f684ab1ea6772f00058605a9ebb2910628</id>
<content type='text'>
* origin/released:
  libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	xorg-server/damageext/damageext.c
	xorg-server/dix/dispatch.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_program.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/glthunk.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/include/os.h
	xorg-server/present/present_request.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-11-25T11:10:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-25T11:10:25+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=0f333fb1102f4886a8ce39f3c09b12e89e5a7f19'/>
<id>urn:sha1:0f333fb1102f4886a8ce39f3c09b12e89e5a7f19</id>
<content type='text'>
* origin/released:
  libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013

Conflicts:
	libXinerama/src/Xinerama.c
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2010-12-08T16:07:08+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-12-08T16:07:08+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=8308417ba79394ca96a326c8cb5c36024b36c1e2'/>
<id>urn:sha1:8308417ba79394ca96a326c8cb5c36024b36c1e2</id>
<content type='text'>
</content>
</entry>
</feed>
