<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/xorg-server/hw/xwin/winclipboard/makefile, branch bugfix/bug4</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4</id>
<link rel='self' href='https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4'/>
<link rel='alternate' type='text/html' href='https://cgit.arctica-project.org/vcxsrv/'/>
<updated>2014-10-01T21:12:13+00:00</updated>
<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>
</feed>
