<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/miext, branch 1.11.4.0</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.4.0</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.4.0'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2011-11-21T07:08:22+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-11-21T07:08:22+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-11-21T07:08:22+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=a8a12d4c8be177f63cae7dc96c2b52f09e228a76'/>
<id>urn:sha1:a8a12d4c8be177f63cae7dc96c2b52f09e228a76</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xserver xkeyboard-config mesa git update 21 nov 2011</title>
<updated>2011-11-21T07:06:12+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-11-21T07:06:12+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=45710577f374972946a8eb37833a9c94e5a299bf'/>
<id>urn:sha1:45710577f374972946a8eb37833a9c94e5a299bf</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>
<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>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-14T08:39:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-14T08:39:30+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=898081f31f99dc35a1602a607a07d1aaff49ac40'/>
<id>urn:sha1:898081f31f99dc35a1602a607a07d1aaff49ac40</id>
<content type='text'>
</content>
</entry>
</feed>
