<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/mesalib/src/mapi/glapi/gen/glX_proto_size.py, 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>fontconfig pixman libX11 mesa git update 30 Apr 2015</title>
<updated>2015-04-30T21:24:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-30T21:24:30+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=a71d524ecad48837e0124a03124bc05f59a48be7'/>
<id>urn:sha1:a71d524ecad48837e0124a03124bc05f59a48be7</id>
<content type='text'>
libX11           commit d3415d1f052530760b4617db45affcb984cfe35c
pixman           commit e0c0153d8e5d42c08c2b9bd2cf2123bff2c48d75
fontconfig       commit 4a6f5efd5f6a468e1872d58e589bcf30ba88e2fd
mesa             commit 1ac7db07b363207e8ded9259f84bbcaa084b8667
</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>Synchronised mesa files</title>
<updated>2012-11-20T07:29:58+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-20T07:29:58+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=96f2a4b36eb811fa1f12dcde03bffc86cfd1781d'/>
<id>urn:sha1:96f2a4b36eb811fa1f12dcde03bffc86cfd1781d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-10-17T06:07:33+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-17T06:07:33+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=856fbbaf1e53303d8307bfae1761f1ba96871f1e'/>
<id>urn:sha1:856fbbaf1e53303d8307bfae1761f1ba96871f1e</id>
<content type='text'>
* origin/released:
  pixman mesa git update 17 oct 2012
</content>
</entry>
<entry>
<title>pixman mesa git update 17 oct 2012</title>
<updated>2012-10-17T06:04:15+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-17T06:04:15+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=ded57b5a4131a213d57f5a20d50b819b7a8924df'/>
<id>urn:sha1:ded57b5a4131a213d57f5a20d50b819b7a8924df</id>
<content type='text'>
pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956
mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
</content>
</entry>
<entry>
<title>Solved problems introduced in merge</title>
<updated>2012-10-11T08:23:20+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-11T08:23:20+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=d863340171e4d6c19e9ef9fdc986ddc1b5e1e63e'/>
<id>urn:sha1:d863340171e4d6c19e9ef9fdc986ddc1b5e1e63e</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-10-11T08:09:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-11T08:09:13+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=30c05ead4fe1b6a341d5b585e3a6b5d255edf650'/>
<id>urn:sha1:30c05ead4fe1b6a341d5b585e3a6b5d255edf650</id>
<content type='text'>
* origin/released:
  xwininfo mesa git update 11 oct 2012

Conflicts:
	mesalib/src/mapi/glapi/gen/glX_proto_recv.py
	mesalib/src/mapi/glapi/gen/glX_proto_size.py
	mesalib/src/mapi/glapi/gen/glX_server_table.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mesa/main/.gitignore
</content>
</entry>
<entry>
<title>xwininfo mesa git update 11 oct 2012</title>
<updated>2012-10-11T06:30:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-11T06:30:47+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=8223fb176264123c86c0d3eb845973d00fd62cc2'/>
<id>urn:sha1:8223fb176264123c86c0d3eb845973d00fd62cc2</id>
<content type='text'>
xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6
mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-12-14T13:08:20+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-12-14T13:08:20+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=7c06219c5953076ef3236b6a8959b99329c77ee9'/>
<id>urn:sha1:7c06219c5953076ef3236b6a8959b99329c77ee9</id>
<content type='text'>
Conflicts:
	mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
	mesalib/src/mapi/glapi/gen/glX_proto_recv.py
	mesalib/src/mapi/glapi/gen/glX_proto_size.py
	mesalib/src/mapi/glapi/gen/gl_gentable.py
	mesalib/src/mapi/glapi/gen/gl_table.py
</content>
</entry>
</feed>
