<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/X11/xtrans/Xtranssock.c, branch bugfix/bug3</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3</id>
<link rel='self' href='https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3'/>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/'/>
<updated>2014-08-30T11:45:43+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-08-30T11:45:43+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-08-30T11:45:43+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=3293021e6f582c7348667e7638941620134525e1'/>
<id>urn:sha1:3293021e6f582c7348667e7638941620134525e1</id>
<content type='text'>
Conflicts:
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
</content>
</entry>
<entry>
<title>xserver libxtrans libxcb xcb-proto libX11 mesa git update 30 Aug 2014</title>
<updated>2014-08-30T11:43:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-08-30T11:41:12+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=e21655632e3fd40b7f6a5cc3c7f3c379d54557c4'/>
<id>urn:sha1:e21655632e3fd40b7f6a5cc3c7f3c379d54557c4</id>
<content type='text'>
xserver          commit 3a51418b2db353519a1779cf3cebbcc9afba2520
libxcb           commit b0e6c2de09c7474868dd7185674fa113a5c2e0aa
libxcb/xcb-proto commit dc0c544fe044ddeb4917bba0c2fed66c70e6db43
libX11           commit 6101b967b641355dd863fd1ce52c6a7d58bcbe68
libxtrans        commit 17491de45c352c833442cccf17a9bd65909889db
mesa             commit 932b0ef1ceecf873213447a8778e5cbe1b3b6be7
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-04-13T12:28:06+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-04-13T12:28:06+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=0bd141efd4832e01c8b269b8566dd5749e30ed55'/>
<id>urn:sha1:0bd141efd4832e01c8b269b8566dd5749e30ed55</id>
<content type='text'>
</content>
</entry>
<entry>
<title>libxtrans mesa git update 31 Mar 2014</title>
<updated>2014-03-31T16:04:51+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-03-31T16:04:51+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=edb5b380994125bf33929ef7dc5a3c456dfbe93b'/>
<id>urn:sha1:edb5b380994125bf33929ef7dc5a3c456dfbe93b</id>
<content type='text'>
libxtrans        commit a57a7f62242e1ea972b81414741729bf3dbae0a4
mesa             commit d681b22ed77274a805c6c8e81925c18eeb57a968
</content>
</entry>
<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://isbjoern.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-22T07:51:58+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-22T07:51:58+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=7dbaa1cffdf176f803f2c7069fb6810e16a86f72'/>
<id>urn:sha1:7dbaa1cffdf176f803f2c7069fb6810e16a86f72</id>
<content type='text'>
* origin/released:
  libxtrans mesa git update 22 nov 2013
</content>
</entry>
<entry>
<title>libxtrans mesa git update 22 nov 2013</title>
<updated>2013-11-22T07:50:11+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-22T07:50:11+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=697f071e3dcd3b01dba050d6c5316f2a23ee82f8'/>
<id>urn:sha1:697f071e3dcd3b01dba050d6c5316f2a23ee82f8</id>
<content type='text'>
libxtrans        commit 8b2c8aabe27bcaa4de6432b53c4a1296010ea823
mesa             commit bb354c6c279031dafc08029a62cd3e76a6c1ca71
</content>
</entry>
<entry>
<title>Solved compilation and run-time problems after latest merge</title>
<updated>2013-11-08T15:53:17+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-08T15:53:17+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=3ef320ddf5d23b4e69cc7d44a17f902e245f6426'/>
<id>urn:sha1:3ef320ddf5d23b4e69cc7d44a17f902e245f6426</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-11-08T12:12:15+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-08T12:12:15+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=f707ea3ce065f0ce40f586c40283fab42059b485'/>
<id>urn:sha1:f707ea3ce065f0ce40f586c40283fab42059b485</id>
<content type='text'>
* origin/released:
  Added presentproto-1.0
  libxtrans libxcb xcb-proto mesa git update 8 nov 2013

Conflicts:
	X11/xtrans/Xtransint.h
	X11/xtrans/Xtranssock.c
	libxcb/src/.gitignore
	mesalib/src/mesa/drivers/dri/common/dri_util.c
</content>
</entry>
<entry>
<title>Solved compilation and link problems after last merge</title>
<updated>2013-11-08T10:47:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-08T10:47:30+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=c8483dc2831dc37d93a36804022f6b064f5962ea'/>
<id>urn:sha1:c8483dc2831dc37d93a36804022f6b064f5962ea</id>
<content type='text'>
</content>
</entry>
</feed>
