<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/os, branch 1.11.0.0</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.0.0</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.0.0'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2011-08-01T07:13:47+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-08-01T07:13:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-08-01T07:13:47+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=6730a76afc49a80573b2e582085086c2956fe96d'/>
<id>urn:sha1:6730a76afc49a80573b2e582085086c2956fe96d</id>
<content type='text'>
Conflicts:
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texparam.c
	xorg-server/config/udev.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/src/kdrive.c
	xorg-server/hw/xfree86/common/xf86Config.c
	xorg-server/hw/xfree86/common/xf86Configure.c
	xorg-server/hw/xfree86/common/xf86Helper.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/common/xf86Option.c
	xorg-server/hw/xfree86/common/xf86Priv.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/xlaunch/config.cc
	xorg-server/hw/xwin/xlaunch/config.h
	xorg-server/hw/xwin/xlaunch/main.cc
	xorg-server/hw/xwin/xlaunch/resources/dialog.rc
	xorg-server/hw/xwin/xlaunch/resources/resources.h
	xorg-server/hw/xwin/xlaunch/resources/resources.rc
	xorg-server/hw/xwin/xlaunch/resources/strings.rc
	xorg-server/hw/xwin/xlaunch/window/util.cc
	xorg-server/hw/xwin/xlaunch/window/util.h
	xorg-server/hw/xwin/xlaunch/window/wizard.h
	xorg-server/include/os.h
	xorg-server/os/log.c
	xorg-server/xkeyboard-config/symbols/lv
</content>
</entry>
<entry>
<title>mesa xserver pixman xkeyboard-config git update 1 aug 2011</title>
<updated>2011-08-01T07:05:15+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-08-01T07:05:15+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=f87ad0cdc41af88f134475ab50b0d604004d9cdc'/>
<id>urn:sha1:f87ad0cdc41af88f134475ab50b0d604004d9cdc</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>merge ^/branches/released .</title>
<updated>2011-05-16T09:49:27+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-16T09:49:27+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=ab5c2d2c78273ccdc7c9734bcba482a33fcf9652'/>
<id>urn:sha1:ab5c2d2c78273ccdc7c9734bcba482a33fcf9652</id>
<content type='text'>
</content>
</entry>
<entry>
<title>xserver xkeyboar-config mesa git update 16 May 2011</title>
<updated>2011-05-16T08:06:12+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-05-16T08:06:12+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=08cbf3b50bfe713044f36b363c73768cd042f13c'/>
<id>urn:sha1:08cbf3b50bfe713044f36b363c73768cd042f13c</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-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>
<entry>
<title>server xkeyboard-config mesa git update 14 Apr 2011</title>
<updated>2011-04-14T06:41:54+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-04-14T06:41:54+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=019fc27ce6dc2a1809107be10d4deb80e0fa436b'/>
<id>urn:sha1:019fc27ce6dc2a1809107be10d4deb80e0fa436b</id>
<content type='text'>
</content>
</entry>
</feed>
