<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/glx/dispatch.h, branch master</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://openid.arctica-project.org/vcxsrv/atom?h=master</id>
<link rel='self' href='https://openid.arctica-project.org/vcxsrv/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/'/>
<updated>2015-06-15T19:36:28+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-06-15T19:36:28+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-06-15T19:36:28+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=008a8d8051786badb83e455bd9281103ba9a6470'/>
<id>urn:sha1:008a8d8051786badb83e455bd9281103ba9a6470</id>
<content type='text'>
Conflicts:
	freetype/src/base/ftfntfmt.c
	freetype/src/cache/ftcimage.c
	freetype/src/cid/cidriver.c
	freetype/src/truetype/ttdriver.c
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	openssl/Makefile
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-05-26T17:43:34+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-05-26T17:43:34+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=912e881bec8b16f2331225960645c3bdf5a8ba2d'/>
<id>urn:sha1:912e881bec8b16f2331225960645c3bdf5a8ba2d</id>
<content type='text'>
Conflicts:
	mesalib/src/mapi/glapi/glapi_priv.h
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	xorg-server/dix/dispatch.c
	xorg-server/os/utils.c
	xorg-server/record/record.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-04-20T20:42:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-20T20:42:55+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=934184bfecd402aae891b8740d788b486aa7269f'/>
<id>urn:sha1:934184bfecd402aae891b8740d788b486aa7269f</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/dlopen.h
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/randr/rrxinerama.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-03-22T13:10:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-03-22T13:10:47+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=3bc24b271f45f9f33484b8cf53b44f33f7e8a237'/>
<id>urn:sha1:3bc24b271f45f9f33484b8cf53b44f33f7e8a237</id>
<content type='text'>
Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mapi/glapi/glapi_nop.c
	mesalib/src/mesa/main/bufferobj.c
</content>
</entry>
<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-29T11:44:10+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T11:44:10+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6'/>
<id>urn:sha1:0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6</id>
<content type='text'>
Conflicts:
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winwindow.c
</content>
</entry>
<entry>
<title>Compiled and synchronised</title>
<updated>2014-08-22T19:51:08+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-08-22T19:51:08+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=bcb354180f20f0c410a77bd32cbf2c1e799632d5'/>
<id>urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-07-28T19:39:53+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-28T19:39:53+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b'/>
<id>urn:sha1:ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-05-11T19:02:05+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-11T19:02:05+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=0b89941658d6117d17555ee28c6e5d7715673705'/>
<id>urn:sha1:0b89941658d6117d17555ee28c6e5d7715673705</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-03-12T15:54:40+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-03-12T15:54:40+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=0c44f026377afe5c616a4fedc3fe8c905a786d8c'/>
<id>urn:sha1:0c44f026377afe5c616a4fedc3fe8c905a786d8c</id>
<content type='text'>
</content>
</entry>
</feed>
