<feed xmlns='http://www.w3.org/2005/Atom'>
<title>vcxsrv/libX11/src/CrGlCur.c, branch bugfix/bug4</title>
<subtitle>VcXsrv Windows X Server (X2Go/Arctica Builds)
</subtitle>
<id>https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4</id>
<link rel='self' href='https://isbjoern.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4'/>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/'/>
<updated>2012-11-19T09:38:33+00:00</updated>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-11-19T09:38:33+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-19T09:38:33+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=24635abae6008bef13e30d798b3f33abab412770'/>
<id>urn:sha1:24635abae6008bef13e30d798b3f33abab412770</id>
<content type='text'>
* origin/released:
  Changed file permissions
  dos -&gt; unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore
</content>
</entry>
<entry>
<title>dos -&gt; unix</title>
<updated>2012-11-19T09:16:38+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-11-19T09:16:38+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c'/>
<id>urn:sha1:3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/released'</title>
<updated>2012-06-08T12:50:37+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-06-08T12:29:46+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=72ec0e3bb2d7fc6b77b2a75873792f781679da6a'/>
<id>urn:sha1:72ec0e3bb2d7fc6b77b2a75873792f781679da6a</id>
<content type='text'>
Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore
</content>
</entry>
<entry>
<title>Used synchronise script to update files</title>
<updated>2012-06-08T07:33:13+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2012-06-08T07:33:13+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=990bc3f015a4f8fce2eb918375defcd44980a845'/>
<id>urn:sha1:990bc3f015a4f8fce2eb918375defcd44980a845</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://isbjoern.arctica-project.org/vcxsrv/commit/?id=dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0'/>
<id>urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge ^/branches/released .</title>
<updated>2010-01-20T11:12:52+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-01-20T11:12:52+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9'/>
<id>urn:sha1:439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Updated to:</title>
<updated>2010-01-19T23:10:44+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2010-01-19T23:10:44+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=a9768b035f2c47be0908520474073cc68d225d8a'/>
<id>urn:sha1:a9768b035f2c47be0908520474073cc68d225d8a</id>
<content type='text'>
  libX11-1.3.3
  pixman-0.17.4

</content>
</entry>
<entry>
<title>svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .</title>
<updated>2009-10-05T15:13:41+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2009-10-05T15:13:41+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=78db264e7992131e0781bdfa5ede821305262b2d'/>
<id>urn:sha1:78db264e7992131e0781bdfa5ede821305262b2d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Updated to</title>
<updated>2009-10-04T19:13:27+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2009-10-04T19:13:27+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=77a4732b0637493966889fe3545966fdc12a1b5e'/>
<id>urn:sha1:77a4732b0637493966889fe3545966fdc12a1b5e</id>
<content type='text'>
  xkeyboard-config-1.7
  pixman-0.16.2
  libX11-1.3
  libXinerama-1.1
  xkbcomp-1.1.1
  recordproto-1.14
  xineramaproto-1.2
  inputproto-2.0
  compositeproto-0.4.1
  xorg-server-1.7.0


</content>
</entry>
<entry>
<title>svn merge file:///D:/svnrepos/vcxsrv/branches/released .</title>
<updated>2009-07-25T12:47:39+00:00</updated>
<author>
<name>marha</name>
<email>marha@users.sourceforge.net</email>
</author>
<published>2009-07-25T12:47:39+00:00</published>
<link rel='alternate' type='text/html' href='https://isbjoern.arctica-project.org/vcxsrv/commit/?id=cb897b8ffca0a68c017c2edfa523cb5ff0491962'/>
<id>urn:sha1:cb897b8ffca0a68c017c2edfa523cb5ff0491962</id>
<content type='text'>
</content>
</entry>
</feed>
