<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/Xext/xres.c, branch release/1.15.2.x</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://openid.arctica-project.org/vcxsrv/atom?h=release%2F1.15.2.x</id>
<link rel='self' href='https://openid.arctica-project.org/vcxsrv/atom?h=release%2F1.15.2.x'/>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/'/>
<updated>2014-04-23T20:47:55+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-04-23T20:47:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-04-23T20:47:55+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=24fb0da18f1c44dfa1f76d8cde8efbb958aa7659'/>
<id>urn:sha1:24fb0da18f1c44dfa1f76d8cde8efbb958aa7659</id>
<content type='text'>
Conflicts:
	mesalib/include/GL/glext.h
	xorg-server/.gitignore
	xorg-server/glx/glxext.c
</content>
</entry>
<entry>
<title>fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr 2014</title>
<updated>2014-04-23T20:41:48+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-04-23T20:41:48+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=d26ea2f474c48afa7d3c261572da5d85b7b62bd8'/>
<id>urn:sha1:d26ea2f474c48afa7d3c261572da5d85b7b62bd8</id>
<content type='text'>
xserver          commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1
xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad
pixman           commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468
fontconfig       commit 81664fe54f117e4781fda5a30429b51858302e91
mesa             commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-03-04T11:23:48+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-03-04T11:18:13+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=45392e4a0642880b569ea5d4a350cdc395a2c7db'/>
<id>urn:sha1:45392e4a0642880b569ea5d4a350cdc395a2c7db</id>
<content type='text'>
* origin/released:
  libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mapi/glapi/glthread.c
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/main/bufferobj.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/winmultiwindowwm.c
</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>2012-11-07T09:08:29+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-07T09:08:29+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=74380c2fc1384a529df4f4995bddcf587fbac389'/>
<id>urn:sha1:74380c2fc1384a529df4f4995bddcf587fbac389</id>
<content type='text'>
* origin/released:
  xserver mesa xkbcomp git update 7 nov 2012

Conflicts:
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mesa/main/.gitignore
	xkbcomp/listing.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
</content>
</entry>
<entry>
<title>xserver mesa xkbcomp git update 7 nov 2012</title>
<updated>2012-11-07T06:53:41+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-07T06:53:41+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=1738a6973deb03f33a71c9527594727cb8bb64b4'/>
<id>urn:sha1:1738a6973deb03f33a71c9527594727cb8bb64b4</id>
<content type='text'>
xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-07-11T09:55:48+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-07-11T09:55:48+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab'/>
<id>urn:sha1:6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab</id>
<content type='text'>
Conflicts:
	xorg-server/Xext/shm.c
	xorg-server/Xext/sync.c
	xorg-server/Xext/xf86bigfont.c
	xorg-server/Xi/opendev.c
	xorg-server/dix/dispatch.c
	xorg-server/include/globals.h
	xorg-server/mi/miinitext.c
</content>
</entry>
<entry>
<title>fontconfig mesa xserver git update  10 Jul 2012</title>
<updated>2012-07-10T12:56:29+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-07-10T12:56:29+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=d137057fd13e83ec15ab416c7fe774741da06047'/>
<id>urn:sha1:d137057fd13e83ec15ab416c7fe774741da06047</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-04-30T09:11:16+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-04-30T09:11:16+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=0f0386d4e90cb0769eddc04b18742d5a9a72ea05'/>
<id>urn:sha1:0f0386d4e90cb0769eddc04b18742d5a9a72ea05</id>
<content type='text'>
Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/glx/glapi_gentable.c
</content>
</entry>
</feed>
