<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/glx/indirect_dispatch.h, 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>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>fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014</title>
<updated>2014-11-29T11:40:08+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T11:40:08+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9'/>
<id>urn:sha1:a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9</id>
<content type='text'>
xserver          commit c52a2b1ebad56820af932dfbc871701a8b04fd9c
libxcb           commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2
libxcb/xcb-proto commit 691d2b97e5989d6d7006304d81bd8fa128477ca1
xkeyboard-config commit b664d7fb8aab9b0f834dd9c81d273c7809561b34
libX11           commit f3831dde6972e4da9e018c6a5f4013d8756a5e78
xkbcomp          commit 1e8ee9d0aad072f04186df84752f5636340574e0
fontconfig       commit b732bf057f4b3ec3bac539803005e9c42d056b2a
mesa             commit 67c498086d0858a94d53ebb6921cfda847250368
</content>
</entry>
<entry>
<title>Synchronised files</title>
<updated>2014-05-11T19:02:05+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-11T19:02:05+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=0b89941658d6117d17555ee28c6e5d7715673705'/>
<id>urn:sha1:0b89941658d6117d17555ee28c6e5d7715673705</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://isbjoern.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://isbjoern.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://isbjoern.arctica-project.org/vcxsrv/commit/?id=66215bff25b8961e396ea4a3b1847ac668de3ff4'/>
<id>urn:sha1:66215bff25b8961e396ea4a3b1847ac668de3ff4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Solved compilation and link problems after last merge</title>
<updated>2013-11-08T10:47:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-11-08T10:47:30+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=c8483dc2831dc37d93a36804022f6b064f5962ea'/>
<id>urn:sha1:c8483dc2831dc37d93a36804022f6b064f5962ea</id>
<content type='text'>
</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>
<entry>
<title>fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013</title>
<updated>2013-10-31T07:40:01+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-10-31T07:40:01+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=e4ef724e06621be9325fc41ed886fd404467fdc0'/>
<id>urn:sha1:e4ef724e06621be9325fc41ed886fd404467fdc0</id>
<content type='text'>
xserver          commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11           commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto          commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig       commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa             commit b16b3c8703f198ca0f025b730d582600df79c19c
</content>
</entry>
</feed>
