vcxsrv/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst, branch 1.10.3.0 VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.0 2011-06-13T17:59:46+00:00 Merge remote-tracking branch 'origin/released' 2011-06-13T17:59:46+00:00 marha marha@users.sourceforge.net 2011-06-13T17:59:46+00:00 urn:sha1:0d495843cebea4ae94a3138db2bf51da80a16391 Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git update 13 Jun 2011 2011-06-13T17:54:55+00:00 marha marha@users.sourceforge.net 2011-06-13T17:54:55+00:00 urn:sha1:f4babb3a422e27cd33fba36f7a21eb67b7dee25d svn merge ^/branches/released . 2011-04-14T08:39:30+00:00 marha marha@users.sourceforge.net 2011-04-14T08:39:30+00:00 urn:sha1:898081f31f99dc35a1602a607a07d1aaff49ac40 server xkeyboard-config mesa git update 14 Apr 2011 2011-04-14T06:41:54+00:00 marha marha@users.sourceforge.net 2011-04-14T06:41:54+00:00 urn:sha1:019fc27ce6dc2a1809107be10d4deb80e0fa436b 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