<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/Xext, branch 1.11.2.0</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2011-11-17T15:46:41+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-11-17T15:46:41+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-11-17T15:46:41+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=97fb1dadc6c52adeba0ac0684129520288ab794f'/>
<id>urn:sha1:97fb1dadc6c52adeba0ac0684129520288ab794f</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/swrast/s_readpix.c
</content>
</entry>
<entry>
<title>xserver mesa git update 17 nov 2011</title>
<updated>2011-11-17T15:37:26+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-11-17T15:37:26+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=d41bc08d1ae8c4784c09d8977816c0fadab1ba52'/>
<id>urn:sha1:d41bc08d1ae8c4784c09d8977816c0fadab1ba52</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-10-05T15:44:57+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-10-05T15:44:57+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=8af87a5b60e37ae84fdd759e2c1602be38be4905'/>
<id>urn:sha1:8af87a5b60e37ae84fdd759e2c1602be38be4905</id>
<content type='text'>
Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mesa/main/syncobj.h
	xorg-server/dix/events.c
	xorg-server/dix/getevents.c
	xorg-server/include/misc.h
</content>
</entry>
<entry>
<title>mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011</title>
<updated>2011-10-05T15:37:34+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-10-05T15:37:34+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=f7025b4baa1ba35ee796785641f04eac5bedb0a6'/>
<id>urn:sha1:f7025b4baa1ba35ee796785641f04eac5bedb0a6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-09-22T13:42:49+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-22T13:42:49+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=46d4f558531910ca1f3297da85b99334d6de2921'/>
<id>urn:sha1:46d4f558531910ca1f3297da85b99334d6de2921</id>
<content type='text'>
Conflicts:
	xorg-server/Xext/dpms.c
	xorg-server/Xext/saver.c
	xorg-server/Xext/security.c
	xorg-server/Xext/shape.c
	xorg-server/Xext/sync.c
	xorg-server/Xi/opendev.c
	xorg-server/fb/wfbrename.h
	xorg-server/glx/glxserver.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/mi/miarc.c
	xorg-server/mi/miwideline.c
	xorg-server/os/io.c
	xorg-server/render/mipict.c
</content>
</entry>
<entry>
<title>libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011</title>
<updated>2011-09-22T13:20:09+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-22T13:20:09+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983'/>
<id>urn:sha1:c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Synchronised line endinge with release branch</title>
<updated>2011-09-12T09:27:51+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-09-12T09:27:51+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0'/>
<id>urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-07-04T12:26:33+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-07-04T12:26:33+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=7cc339a490eac34596e97788c3b0092d58459cf6'/>
<id>urn:sha1:7cc339a490eac34596e97788c3b0092d58459cf6</id>
<content type='text'>
Conflicts:
	mesalib/common.py
	mesalib/docs/GL3.txt
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/SConscript
	xorg-server/Xext/xtest.c
	xorg-server/dix/getevents.c
	xorg-server/dix/window.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyr.h
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/src/kdrive.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/dri2/dri2.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwinEvents.c
	xorg-server/hw/xquartz/darwinEvents.h
	xorg-server/hw/xquartz/darwinXinput.c
	xorg-server/hw/xwin/InitInput.c
	xorg-server/include/input.h
	xorg-server/include/window.h
	xorg-server/mi/mipointer.c
	xorg-server/test/Makefile.am
	xorg-server/test/xi2/protocol-eventconvert.c
</content>
</entry>
<entry>
<title>xserver mesa git update 4 July 2011</title>
<updated>2011-07-04T12:21:49+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-07-04T12:21:49+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=5c671fd7f8198bed2fc32b33b81d1081f1486ed9'/>
<id>urn:sha1:5c671fd7f8198bed2fc32b33b81d1081f1486ed9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-07-01T14:49:54+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-07-01T14:49:54+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=3bbcbc59b6d98f09b26f39d6208faec76cc6aa3e'/>
<id>urn:sha1:3bbcbc59b6d98f09b26f39d6208faec76cc6aa3e</id>
<content type='text'>
Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma
</content>
</entry>
</feed>
