<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/os/WaitFor.c, branch bugfix/bug4</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4</id>
<link rel='self' href='https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4'/>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/'/>
<updated>2015-02-22T20:39:56+00:00</updated>
<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://openid.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-11-29T15:13:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T15:13:30+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c'/>
<id>urn:sha1:7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c</id>
<content type='text'>
Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glshim.c
	xorg-server/hw/xwin/winclipboard/xevents.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winprefslex.l
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/mi/miarc.c
	xorg-server/os/connection.c
</content>
</entry>
<entry>
<title>fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014</title>
<updated>2014-11-29T11:40:08+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T11:40:08+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9'/>
<id>urn:sha1:a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9</id>
<content type='text'>
xserver          commit c52a2b1ebad56820af932dfbc871701a8b04fd9c
libxcb           commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2
libxcb/xcb-proto commit 691d2b97e5989d6d7006304d81bd8fa128477ca1
xkeyboard-config commit b664d7fb8aab9b0f834dd9c81d273c7809561b34
libX11           commit f3831dde6972e4da9e018c6a5f4013d8756a5e78
xkbcomp          commit 1e8ee9d0aad072f04186df84752f5636340574e0
fontconfig       commit b732bf057f4b3ec3bac539803005e9c42d056b2a
mesa             commit 67c498086d0858a94d53ebb6921cfda847250368
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-01-15T20:37:10+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-01-15T20:37:10+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=b7f01cb1f6cfd1ec301f650a073436c91ec614aa'/>
<id>urn:sha1:b7f01cb1f6cfd1ec301f650a073436c91ec614aa</id>
<content type='text'>
* origin/released:
  mesa xkeyboard-config xserver git update 15 jan 2014
  randrproto libfontenc mesa xserver git update 10 Jan 2014
  randsrproto fontconfig libX11 git update 6 Jan 2014

Conflicts:
	mesalib/src/glsl/builtin_functions.cpp
	mesalib/src/glsl/ir_builder.h
	xorg-server/Xext/xres.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/include/gc.h
	xorg-server/os/access.c
</content>
</entry>
<entry>
<title>mesa xkeyboard-config xserver git update 15 jan 2014</title>
<updated>2014-01-15T20:23:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-01-15T20:23:25+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=1b0fcca503ae9cf2d462b60770f96c794dfbb27a'/>
<id>urn:sha1:1b0fcca503ae9cf2d462b60770f96c794dfbb27a</id>
<content type='text'>
xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-11-14T07:33:57+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-14T07:33:57+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b'/>
<id>urn:sha1:cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b</id>
<content type='text'>
* origin/released:
  mesa xserver pixman git update 9 nov 2013

Conflicts:
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	xorg-server/Xext/shm.c
</content>
</entry>
<entry>
<title>mesa xserver pixman git update 9 nov 2013</title>
<updated>2013-11-13T07:07:38+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-13T07:07:38+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d'/>
<id>urn:sha1:8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d</id>
<content type='text'>
xserver          commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman           commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa             commit e0489531455623aa21aa565b2c890362d8437f23
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-10-21T05:48:16+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-10-21T05:48:16+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=c665b6e88274f8bc603b0f14f92bf09d2023bd4d'/>
<id>urn:sha1:c665b6e88274f8bc603b0f14f92bf09d2023bd4d</id>
<content type='text'>
* origin/released:
  fontconfig mesa xserver xkeyboard-config git update 21 okt 2013
</content>
</entry>
<entry>
<title>fontconfig mesa xserver xkeyboard-config git update 21 okt 2013</title>
<updated>2013-10-21T05:47:02+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-10-21T05:47:02+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=6d895f30ab93d71afddc612d8b007f2de7f04165'/>
<id>urn:sha1:6d895f30ab93d71afddc612d8b007f2de7f04165</id>
<content type='text'>
xserver          commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9
libxcb           commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 55c75accecf0e76d2aa38656efd2be4044b9e643
xkeyboard-config commit 39a9a10ff11f6872e4b278240fbabb4e98209fa6
libX11           commit 18a5278b008e9faa59b346fcab18a8d74b875fda
libXdmcp         commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext          commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4
libfontenc       commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama      commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff
libXau           commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
xkbcomp          commit 839ccda42d8b088d94324cd77c4be954859914d3
pixman           commit 3c2f4b651747c1ac484c39d5128cae5483094342
xextproto        commit f27fcc99d1cf935cc289933326f7d3baacd5107a
randrproto       commit ca7cc541c2e43e6c784df19b4583ac35829d2f72
glproto          commit 8e3407e02980d088e20041e79bdcdd3737e7827e
mkfontscale      commit f48de13423c7300f4da9f61993b624426b38ddc0
xwininfo         commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft           commit c5e760a239afc62a1c75e0509868e35957c8df52
libXmu           commit 2539e539eafdac88177c8ee30b043c5d52f017e4
libxtrans        commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0
fontconfig       commit 5e029db4971e37437cfe6147d52d00136dfb8cb5
mesa             commit 14429295e16cf9b7616494fb68f400dfb9c80c71
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-05-02T07:01:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-05-02T07:01:55+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=3d353f31ac1671d1b39c09b1f8d82c8811d3edd6'/>
<id>urn:sha1:3d353f31ac1671d1b39c09b1f8d82c8811d3edd6</id>
<content type='text'>
Conflicts:
	xorg-server/os/connection.c
</content>
</entry>
</feed>
