<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/mesalib/src/mapi/glapi/gen/glX_proto_size.py, 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>2012-11-20T07:29:58+00:00</updated>
<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>
<entry>
<title>git update mesa 14 dec 2011</title>
<updated>2011-12-14T07:32:15+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-12-14T07:32:15+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=53d28537755790ee4625dc16f560cad5aa93f56b'/>
<id>urn:sha1:53d28537755790ee4625dc16f560cad5aa93f56b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2011-11-07T07:32:50+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-11-07T07:32:50+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=09c0aa163ab00fcf51c0a217c5efec55e32361d6'/>
<id>urn:sha1:09c0aa163ab00fcf51c0a217c5efec55e32361d6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Updated to mesalib 7.9</title>
<updated>2010-11-22T19:42:40+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-11-22T19:42:40+00:00</published>
<link rel='alternate' type='text/html' href='https://openid.arctica-project.org/vcxsrv/commit/?id=85ef9930f56bf15181f9a0b238f03d55303cf411'/>
<id>urn:sha1:85ef9930f56bf15181f9a0b238f03d55303cf411</id>
<content type='text'>
</content>
</entry>
</feed>
