diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /xorg-server/xkeyboard-config/rules | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 4b18513e9..d21891db2 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1388,18 +1388,6 @@ </layout> <layout> <configItem> - <name>ad</name> - <!-- Keyboard indicator for Catalan layouts --> - <_shortDescription>ca</_shortDescription> - <_description>Catalan</_description> - <languageList> - <iso639Id>cat</iso639Id> - </languageList> - </configItem> - <variantList/> - </layout> - <layout> - <configItem> <name>af</name> <!-- Keyboard indicator for Afghani layouts --> <_shortDescription>fa</_shortDescription> @@ -6361,7 +6349,7 @@ <group allowMultipleSelection="true"> <!-- Special shortcuts for the Euro character --> <configItem> - <name>eurosign</name> + <name>currencysign</name> <_description>Adding currency signs to certain keys</_description> </configItem> <option> |