<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/damageext, branch master</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=master</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2014-01-15T20:37:10+00:00</updated>
<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://cgit.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://cgit.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-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>libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013</title>
<updated>2013-12-22T11:51:45+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-12-22T11:51:45+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=c81020559f329a516191927222b3698ba7370aca'/>
<id>urn:sha1:c81020559f329a516191927222b3698ba7370aca</id>
<content type='text'>
xserver          commit a68df147421da21528b5be2d34678383922fa352
libxcb           commit f653464554469b5767f1c99abced25a76bace047
libxcb/xcb-proto commit 4087fc682c5ceb849b74442e17a6b73176e5eecb
xkeyboard-config commit a224a636139d22e1dc7ca7d23782cd656e87bcf5
libX11           commit 3d69b0a83e62f8f6fbdd952fc49cdbdf8825e1e6
libXdmcp         commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext          commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb
libfontenc       commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama      commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau           commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
xkbcomp          commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman           commit 945ab7a6f3eb6241f07e8f094dc0e647d1f10d9d
xextproto        commit 3f355f138d6df57e067458a20f47307883048adb
randrproto       commit e7526e6b5fe0966929cda10b2ded0258413744db
glproto          commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale      commit 880a0c4733e62e54e6a0f1238c7430727d23657b
xwininfo         commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft           commit 4acfdaf95adb0a05c2a25550bdde036c865902f4
libXmu           commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans        commit 2c0a7840a28ae696e80e73157856d7a049fdf6c7
fontconfig       commit 5c725f2f5829238d16116f782d00d8bb0defaf08
mesa             commit 2efe7927d38983029784825fc4897e9b77aa237e
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-10-07T14:40:05+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-10-07T14:40:05+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=8f0ed7f7a754df710b13b9dabbaa32b5d4211182'/>
<id>urn:sha1:8f0ed7f7a754df710b13b9dabbaa32b5d4211182</id>
<content type='text'>
* origin/released:
  xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/dix/privates.c
	xorg-server/glx/glxcmds.c
	xorg-server/hw/kdrive/ephyr/ephyr.h
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/kdrive/ephyr/hostx.c
</content>
</entry>
<entry>
<title>xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013</title>
<updated>2013-10-07T06:23:46+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-10-07T06:23:46+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=81fd17c8678e89cea6610b8b2996b028b21eb5dc'/>
<id>urn:sha1:81fd17c8678e89cea6610b8b2996b028b21eb5dc</id>
<content type='text'>
xserver          commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
xkeyboard-config commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27
libXdmcp         commit 089081dca4ba3598c6f9bf401c029378943b5854
pixman           commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7
fontconfig       commit 604c2a683f1357fc65bad372b5d25a90099f827f
mesa             commit cfbfb50cb8d47b7f6975828b504936f9324f3b12
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-09-23T07:49:27+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-09-23T07:49:27+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=b299d73bb416e2a26a642a54d5a15ea9fa30df33'/>
<id>urn:sha1:b299d73bb416e2a26a642a54d5a15ea9fa30df33</id>
<content type='text'>
* origin/released:
  mesa xserver git update 23 Sep 2013

Conflicts:
	mesalib/src/glsl/ast.h
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/glsl_symbol_table.cpp
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/list.h
</content>
</entry>
<entry>
<title>mesa xserver git update 23 Sep 2013</title>
<updated>2013-09-23T07:41:49+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-09-23T07:41:49+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae'/>
<id>urn:sha1:e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae</id>
<content type='text'>
xserver          commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
mesa             commit 6d29db715b8d60718ada1ab8ad19d969cac43caf
</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://cgit.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://cgit.arctica-project.org/vcxsrv/commit/?id=d137057fd13e83ec15ab416c7fe774741da06047'/>
<id>urn:sha1:d137057fd13e83ec15ab416c7fe774741da06047</id>
<content type='text'>
</content>
</entry>
</feed>
