<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/gl/internal, branch bugfix/bug3</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3</id>
<link rel='self' href='https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3'/>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/'/>
<updated>2015-04-30T21:29:47+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-04-30T21:29:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-30T21:26:47+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=055e5645a789d2822d3c4e5a3bc81ff6a969ff31'/>
<id>urn:sha1:055e5645a789d2822d3c4e5a3bc81ff6a969ff31</id>
<content type='text'>
</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>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>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>Increased to version 1.15.2.0</title>
<updated>2014-07-05T14:42:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-05T14:42:13+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=0fc6b05dc947d92381453fbe0ce690196719da86'/>
<id>urn:sha1:0fc6b05dc947d92381453fbe0ce690196719da86</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files and solved compilaton errors</title>
<updated>2014-07-01T12:23:00+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-01T12:23:00+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=3095a03ec3cb1f05b49362327d10a767299d7635'/>
<id>urn:sha1:3095a03ec3cb1f05b49362327d10a767299d7635</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-05-01T17:55:24+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-01T17:55:24+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=f8bfd354a693f0dc868dd565fc6d4a1a2915c887'/>
<id>urn:sha1:f8bfd354a693f0dc868dd565fc6d4a1a2915c887</id>
<content type='text'>
</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>Synchronised files and added missing files in mesa project</title>
<updated>2014-02-10T20:12:48+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-02-10T20:12:48+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=5ec0616d4e3c4c6095f4975abbe9c21e5b6af967'/>
<id>urn:sha1:5ec0616d4e3c4c6095f4975abbe9c21e5b6af967</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Solved compile problems due to latest merge</title>
<updated>2013-12-22T21:06:29+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-12-22T21:04:41+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=66215bff25b8961e396ea4a3b1847ac668de3ff4'/>
<id>urn:sha1:66215bff25b8961e396ea4a3b1847ac668de3ff4</id>
<content type='text'>
</content>
</entry>
</feed>
