<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/fb, branch 1.10.3.1</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.1</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.1'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2011-07-01T14:49:54+00:00</updated>
<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>
<entry>
<title>xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli</title>
<updated>2011-07-01T12:21:21+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-07-01T12:21:21+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=d9f970a847e1af706f07560ef163b229bb592307'/>
<id>urn:sha1:d9f970a847e1af706f07560ef163b229bb592307</id>
<content type='text'>
2011
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-05-29T13:44:00+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-29T13:44:00+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=75b5635aa9e9791d10e3f63538e75237303ee6da'/>
<id>urn:sha1:75b5635aa9e9791d10e3f63538e75237303ee6da</id>
<content type='text'>
Conflicts:
	libX11/specs/libX11/CH08.xml
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/queryobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mkfontscale/list.h
	pixman/pixman/Makefile.win32
	xorg-server/dix/devices.c
	xorg-server/dix/events.c
	xorg-server/dix/inpututils.c
	xorg-server/fb/fbbltone.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xfree86/common/xf86Module.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xfree86/man/xorg.conf.man
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/include/input.h
	xorg-server/include/inputstr.h
	xorg-server/mi/mieq.c
	xorg-server/randr/rrscreen.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
</content>
</entry>
<entry>
<title>libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011</title>
<updated>2011-05-29T13:02:10+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-29T13:02:10+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=1ccf18dc09e288ddf937aa890b50c8d0a9df4319'/>
<id>urn:sha1:1ccf18dc09e288ddf937aa890b50c8d0a9df4319</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2011-04-28T11:14:32+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-28T11:14:32+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=1840c5631682e0a69ed11487a23a43d45f2d15e1'/>
<id>urn:sha1:1840c5631682e0a69ed11487a23a43d45f2d15e1</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xserver xkeyboard-config mesa git update 28 Apr 2011</title>
<updated>2011-04-28T07:58:00+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-28T07:58:00+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=57a879849643e79d9674198a3a77c59532fb79b4'/>
<id>urn:sha1:57a879849643e79d9674198a3a77c59532fb79b4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2011-04-05T14:52:19+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-05T14:52:19+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6'/>
<id>urn:sha1:6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011</title>
<updated>2011-04-05T09:51:44+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-05T09:51:44+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=eaedc21febeadad4cf0e370f5d97e7bdb4470870'/>
<id>urn:sha1:eaedc21febeadad4cf0e370f5d97e7bdb4470870</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2011-04-01T12:04:34+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-01T12:04:34+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=0fd309bfed8f9f61a8ea8bbbe7628d0af471c070'/>
<id>urn:sha1:0fd309bfed8f9f61a8ea8bbbe7628d0af471c070</id>
<content type='text'>
</content>
</entry>
<entry>
<title>libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 Apr 2011</title>
<updated>2011-04-01T07:17:02+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-01T07:17:02+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d'/>
<id>urn:sha1:5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d</id>
<content type='text'>
</content>
</entry>
</feed>
