vcxsrv/xorg-server/xkeyboard-config/rules/xkb.dtd, branch bugfix/bug4 VcXsrv Windows X Server (X2Go/Arctica Builds) https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4 2011-09-12T09:27:51+00:00 Synchronised line endinge with release branch 2011-09-12T09:27:51+00:00 marha marha@users.sourceforge.net 2011-09-12T09:27:51+00:00 urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 Merge remote-tracking branch 'origin/released' 2011-06-05T14:04:18+00:00 marha marha@users.sourceforge.net 2011-06-05T14:04:18+00:00 urn:sha1:097c0d8400d976c5c372db576a11764e87994c7f Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011 2011-06-05T14:00:23+00:00 marha marha@users.sourceforge.net 2011-06-05T14:00:23+00:00 urn:sha1:0e1ac54142d49051da9a74f37a792225a4e8d7b0 svn merge ^/branches/released . 2011-03-02T10:53:27+00:00 marha marha@users.sourceforge.net 2011-03-02T10:53:27+00:00 urn:sha1:43fb99508848b8e9f4ced9a7e7a6c3692047fbf1 xkeyboard-config mesa git update 2 Mar 2011 2011-03-02T08:06:29+00:00 marha marha@users.sourceforge.net 2011-03-02T08:06:29+00:00 urn:sha1:56950d7bed70ee82186f44f9333537cdbb33c448 Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch. 2010-07-13T07:48:55+00:00 marha marha@users.sourceforge.net 2010-07-13T07:48:55+00:00 urn:sha1:d8f81c980a46279ac619312a914b563144894512 Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git repository) 2010-07-13T07:35:01+00:00 marha marha@users.sourceforge.net 2010-07-13T07:35:01+00:00 urn:sha1:81124070f120ab658e094b64f6944d701b003a99