<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/hw/xwin/makefile, branch bugfix/bug3</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2015-04-20T20:42:55+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2015-04-20T20:42:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2015-04-20T20:42:55+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=934184bfecd402aae891b8740d788b486aa7269f'/>
<id>urn:sha1:934184bfecd402aae891b8740d788b486aa7269f</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/dlopen.h
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/randr/rrxinerama.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://cgit.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>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://cgit.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>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-09-10T08:42:30+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-09-10T08:38:33+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7'/>
<id>urn:sha1:2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7</id>
<content type='text'>
* origin/released:
  fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013

Conflicts:
	mesalib/src/glsl/.gitignore
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winsetsp.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2013-07-25T07:24:55+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2013-07-25T07:24:55+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=af62a89a4e677bc0a10094be86816b2e273b2c4a'/>
<id>urn:sha1:af62a89a4e677bc0a10094be86816b2e273b2c4a</id>
<content type='text'>
* origin/released:
  xserver mesa git update 25 Jul 2013

Conflicts:
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-11-29T08:05:49+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-29T08:05:13+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=0831039c0d449a3b5874c12ee365a8d5d2be7b8c'/>
<id>urn:sha1:0831039c0d449a3b5874c12ee365a8d5d2be7b8c</id>
<content type='text'>
* origin/released:
  fontconfig xserver mesa git update 29 nov 2012

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-10-30T09:18:15+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-10-30T09:18:15+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=33d29586bf3a280e821e0bf62694492dba459dab'/>
<id>urn:sha1:33d29586bf3a280e821e0bf62694492dba459dab</id>
<content type='text'>
* origin/released:
  fontconfig xserver mesa git update 30 oct 2012

Conflicts:
	xorg-server/dix/grabs.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winprefslex.l
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winregistry.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-07-18T08:12:07+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-07-18T08:12:07+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=980040093547dc8dd563d8cb9d003aa39737eda4'/>
<id>urn:sha1:980040093547dc8dd563d8cb9d003aa39737eda4</id>
<content type='text'>
Conflicts:
	mesalib/src/glsl/.gitignore
	xorg-server/Xext/panoramiX.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwndproc.c
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2011-07-14T14:15:03+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-07-14T14:15:03+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=31ee9c57db79281e122d3c4acb0f8eae07f4449f'/>
<id>urn:sha1:31ee9c57db79281e122d3c4acb0f8eae07f4449f</id>
<content type='text'>
Conflicts:
	mesalib/src/mesa/state_tracker/st_context.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.c
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/man/XWin.man
	xorg-server/hw/xwin/winmultiwindowwindow.c
</content>
</entry>
<entry>
<title>Removed dependency on itself</title>
<updated>2011-03-07T09:22:47+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2011-03-07T09:22:47+00:00</published>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/commit/?id=4f15fcdc65f989800d91278a4040d14f9ebd76ca'/>
<id>urn:sha1:4f15fcdc65f989800d91278a4040d14f9ebd76ca</id>
<content type='text'>
</content>
</entry>
</feed>
