<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/mesalib/src/glsl/main.cpp, branch bugfix/bug3</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3</id>
<link rel='self' href='https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3'/>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/'/>
<updated>2015-02-22T20:39:56+00:00</updated>
<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>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-11-29T15:13:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T15:13:30+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c'/>
<id>urn:sha1:7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c</id>
<content type='text'>
Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glshim.c
	xorg-server/hw/xwin/winclipboard/xevents.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winprefslex.l
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/mi/miarc.c
	xorg-server/os/connection.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-11-29T11:44:10+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-11-29T11:44:10+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6'/>
<id>urn:sha1:0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6</id>
<content type='text'>
Conflicts:
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winwindow.c
</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>libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014</title>
<updated>2014-10-25T17:53:22+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-10-25T17:53:22+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=d6d5581d5fba846c8476ad4d593da662306765d7'/>
<id>urn:sha1:d6d5581d5fba846c8476ad4d593da662306765d7</id>
<content type='text'>
xserver          commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e
xkeyboard-config commit 0d4c3d9d891536aa1ec4f1fff5e3df51cfd2718d
pixman           commit 594e6a6c93e92fcfb495e987aec5617f6c37f467
libXft           commit e8a83226bc10afb587f6f34daac44d2ef809c85e
mesa             commit 13862812dc910a4ef57cb72cb9fe777ce3c14515
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-10-01T21:12:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-10-01T21:12:13+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=88236adfe3eb41b8368b4c9ecf3e09a7199dc474'/>
<id>urn:sha1:88236adfe3eb41b8368b4c9ecf3e09a7199dc474</id>
<content type='text'>
Conflicts:
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/win.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/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winglobals.c
</content>
</entry>
<entry>
<title>libxtrans pixman fontconfig mesa xserver xkeyboard-config git update 1 Oct 2014</title>
<updated>2014-10-01T18:47:44+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-10-01T18:47:44+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=30eb28e89e513ba7c04e8424be0cba326a01882b'/>
<id>urn:sha1:30eb28e89e513ba7c04e8424be0cba326a01882b</id>
<content type='text'>
plink 10277
xserver          commit d3d845ca9e92f0a2ccde93f4242d7769cfe14164
xkeyboard-config commit 73aa90ce32967747c84a1b5fe32cee329bc3bbcf
pixman           commit f078727f392bc9f235df916e75634ed87177b9b4
libxtrans        commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
fontconfig       commit 1082161ea303cf2bbc13b62a191662984131e820
mesa             commit 4f7916ab4f8093fa33519dfa3d08e73b4d35ebe3
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2014-05-11T15:43:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-11T15:43:25+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=26dfcdba6c306d6312c598e4191449302329be68'/>
<id>urn:sha1:26dfcdba6c306d6312c598e4191449302329be68</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/main/imports.h
</content>
</entry>
<entry>
<title>xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014</title>
<updated>2014-05-07T22:18:25+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2014-05-07T22:18:25+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=683155917770af9e63a938bc450df25d1904d567'/>
<id>urn:sha1:683155917770af9e63a938bc450df25d1904d567</id>
<content type='text'>
xserver          commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d
libxcb           commit d978a4f69b30b630f28d07f1003cf290284d24d8
libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415
xkeyboard-config commit 3e54f31b1f118f00c240f59d72d7ddb685c6db79
libX11           commit 8be4610939b833587954957f5963eb4191b43d19
libXdmcp         commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext          commit 11aad96bd689d54156064d2e81213dc827a689d1
libfontenc       commit 0037a42107b952c9d903719615747e760e4e7247
libXinerama      commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau           commit 1e4635be11154dd8262f37b379511bd627defa2a
xkbcomp          commit d4e02a09258063c6d024c3ccd42d6b22212e6e18
pixman           commit 91f32ce961bc85f98b3372b95681ad8918d24b18
xextproto        commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
randrproto       commit a4a6694c059d74247c16527eef4a0ec9f56bbef6
glproto          commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale      commit 399db42a151687f1181ae23d28a76d31125a2853
xwininfo         commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft           commit 4acfdaf95adb0a05c2a25550bdde036c865902f4
libXmu           commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans        commit a57a7f62242e1ea972b81414741729bf3dbae0a4
fontconfig       commit 81664fe54f117e4781fda5a30429b51858302e91
mesa             commit 9ced3fc649ec04710a5f5c855bfb582b898cff83
</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>
</feed>
