<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/mesalib/src/mesa/main/queryobj.c, branch bugfix/bug4</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4</id>
<link rel='self' href='https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4'/>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/'/>
<updated>2015-04-20T20:42:55+00:00</updated>
<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://isbjoern.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>randrproto  xkeyboard-config fontconfig libX11 libXdmcp libXmu pixman xkbcomp xserver mesa git update 20 Apr 2015</title>
<updated>2015-04-20T19:25:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-20T19:25:25+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=4ba9be2882d9f1567809edb0a31fcdf11320d41f'/>
<id>urn:sha1:4ba9be2882d9f1567809edb0a31fcdf11320d41f</id>
<content type='text'>
xserver          commit b1029716e41e252f149b82124a149da180607c96
xkeyboard-config commit 7d00bcc2d9c3944bbdfcbe472ee3299729dc7687
libX11           commit 748d47e69f5c12d8557d56a8a8ec166588da7b93
libXdmcp         commit b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6
xkbcomp          commit 1ae525b3d236b59e6437b2b5433d460e18370973
pixman           commit 58e21d3e45c5227c2ca9ac00cf044f22a7975180
randrproto       commit 98da0d6e48b7d124d6788ea568e9f9e3dc204322
libXmu           commit 4459e6940fe3fdf26a8d5d4c71989498bc400a62
fontconfig       commit 07be485a0a84995ce69bf60e3b1bb22cb35f6b0e
mesa             commit c1485f4b7d044724b3dbc1011f3c3a8a53132010
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-03-05T22:42:09+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-03-05T22:40:39+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=c646056120fe14e4c4ccf81bac5d78d61225a8e8'/>
<id>urn:sha1:c646056120fe14e4c4ccf81bac5d78d61225a8e8</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/queryobj.c
</content>
</entry>
<entry>
<title>fontconfig mesa git update 5 Mar 2015</title>
<updated>2015-03-05T21:17:40+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-03-05T21:17:40+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=8574eba804031f6b19713f0b02952280730bf62e'/>
<id>urn:sha1:8574eba804031f6b19713f0b02952280730bf62e</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-02-24T06:44:41+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-02-24T06:44:41+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=f64e43decd0fdac938feddeedee255dc4508aaa5'/>
<id>urn:sha1:f64e43decd0fdac938feddeedee255dc4508aaa5</id>
<content type='text'>
Conflicts:
	apps/xcalc/math.c
	freetype/src/base/ftbdf.c
	freetype/src/base/fttype1.c
	freetype/src/pfr/pfrobjs.c
	mesalib/src/mesa/main/.gitignore
	openssl/Configure
	openssl/Makefile
	openssl/crypto/cryptlib.c
	openssl/crypto/opensslconf.h
	openssl/test/v3nametest.c
	openssl/util/mk1mf.pl
	openssl/util/pl/VC-32.pl
	xorg-server/Xi/xipassivegrab.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/getevents.c
	xorg-server/glx/glxcmds.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/hw/xwin/winclipboard/internal.h
	xorg-server/hw/xwin/winclipboard/thread.c
	xorg-server/hw/xwin/winclipboard/wndproc.c
	xorg-server/hw/xwin/winclipboard/xevents.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/render/render.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://isbjoern.arctica-project.org/vcxsrv/commit/?id=462f18c7b25fe3e467f837647d07ab0a78aa8d2b'/>
<id>urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xwininfo fontconfig libX11 libXdmcp libfontenc libxcb libxcb/xcb-proto mesalib xserver xkeyboard-config mkfontscale git update 22 Feb 2015</title>
<updated>2015-02-22T13:31:16+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-02-22T13:31:16+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=f1c2db43dcf35d2cf4715390bd2391c28e42a8c2'/>
<id>urn:sha1:f1c2db43dcf35d2cf4715390bd2391c28e42a8c2</id>
<content type='text'>
xserver          commit 3a06faf3fcdb7451125a46181f9152e8e59e9770
libxcb           commit e3ec1f74637237ce500dfd0ca59f2e422da4e019
libxcb/xcb-proto commit 4c550465934164aab2449a125f75f4ca07816233
xkeyboard-config commit 26f344c93f8c6141e9233eb68088ba4fd56bc9ef
libX11           commit c8e19b393defd53f046ddc2da3a16881221b3c34
libXdmcp         commit 9f4cac7656b221ce2a8f97e7bd31e5e23126d001
libfontenc       commit de1843aaf76015c9d99416f3122d169fe331b849
mkfontscale      commit 87d628f8eec170ec13bb9feefb1ce05aed07d1d6
xwininfo         commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e
fontconfig       commit d6d5adeb7940c0d0beb86489c2a1c2ce59e5c044
mesa             commit 4359954d842caa2a9f8d4b50d70ecc789884b68b
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-07-01T07:29:23+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-01T07:29:23+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad'/>
<id>urn:sha1:b6fac85cb1bb78f48ed81aaf42ba6b840b2d6cad</id>
<content type='text'>
* origin/released:
  fontconfig mesa pixman git update 1 July 2014
</content>
</entry>
<entry>
<title>fontconfig mesa pixman git update 1 July 2014</title>
<updated>2014-07-01T06:46:12+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-07-01T06:46:12+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8'/>
<id>urn:sha1:cfc5bafcb2db8c6e05d7be6bb7315960be08c0d8</id>
<content type='text'>
pixman           commit 5a2edb3f2c2cfde6b25ac614e2004a9f78583d74
fontconfig       commit dab60e4476ada4ad4639599ea24dd012d4a79584
mesa             commit 1bfc0a11027449ae7ab7c28eb695f26de530eccf
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-11-04T11:11:17+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-04T11:11:17+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=d79b6645eb21ca82d506ef038b8ea71a1e431f3f'/>
<id>urn:sha1:d79b6645eb21ca82d506ef038b8ea71a1e431f3f</id>
<content type='text'>
* origin/released:
  fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

Conflicts:
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.c
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdri.c
	xorg-server/glx/glxext.c
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.c
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_texture_compression.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c
</content>
</entry>
</feed>
