<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/mesalib/src/mapi/glapi/gen/glX_server_table.py, branch master</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://isbjoern.arctica-project.org/vcxsrv/atom?h=master</id>
<link rel='self' href='https://isbjoern.arctica-project.org/vcxsrv/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://isbjoern.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://isbjoern.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>fontconfig libX11 libxcb xcb-proto mesa pixman xserver xkeyboard-config git update 15 June 2015</title>
<updated>2015-06-15T18:27:26+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-06-15T18:27:26+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f'/>
<id>urn:sha1:e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f</id>
<content type='text'>
xserver          commit fa12f2c150b2f50de9dac4a2b09265f13af353af
libxcb           commit f85661c3bca97faa72431df92a3867be39a74e23
libxcb/xcb-proto commit fef8a4cdc2cacd9541a656026371a3d338dadb8e
xkeyboard-config commit 61fb58a95a071cc1c212f6d3808908c086219fe0
libX11           commit f0286b2770ece10aef5e2e8c004260217f12fd25
pixman           commit eebc1b78200aff075dbcae9c8d00edad1f830d91
fontconfig       commit f6d61c9beed856a925bd60c025b55284b2d88161
mesa             commit 932d1613d1e15ec22555e5ec09105c49eb850e36
</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://isbjoern.arctica-project.org/vcxsrv/commit/?id=96f2a4b36eb811fa1f12dcde03bffc86cfd1781d'/>
<id>urn:sha1:96f2a4b36eb811fa1f12dcde03bffc86cfd1781d</id>
<content type='text'>
</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://isbjoern.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://isbjoern.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://isbjoern.arctica-project.org/vcxsrv/commit/?id=8223fb176264123c86c0d3eb845973d00fd62cc2'/>
<id>urn:sha1:8223fb176264123c86c0d3eb845973d00fd62cc2</id>
<content type='text'>
xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6
mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
</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://isbjoern.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://isbjoern.arctica-project.org/vcxsrv/commit/?id=09c0aa163ab00fcf51c0a217c5efec55e32361d6'/>
<id>urn:sha1:09c0aa163ab00fcf51c0a217c5efec55e32361d6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Preperation of new merge with directory moves</title>
<updated>2010-11-22T19:03:06+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-11-22T19:03:06+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=3c67b8c5f69522045d6f869b22fb14f7d7458a57'/>
<id>urn:sha1:3c67b8c5f69522045d6f869b22fb14f7d7458a57</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Preperation for new release of mesa</title>
<updated>2010-11-22T18:56:42+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-11-22T18:56:42+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=94810d19989336862251dbf69c3f3acb18a9b06d'/>
<id>urn:sha1:94810d19989336862251dbf69c3f3acb18a9b06d</id>
<content type='text'>
</content>
</entry>
</feed>
