aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-26 08:07:23 +0100
committermarha <marha@users.sourceforge.net>2013-11-26 08:07:23 +0100
commitcec4285e4e6b06babf340165148ff8c31601b382 (patch)
tree9e19864958826fb517b22ba224aa713307272687 /xorg-server
parent0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (diff)
parent4042ec939a2cdc8473479c900871c4c8c0b4e818 (diff)
downloadvcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.gz
vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.bz2
vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xkeyboard-config mesa git update 26 nov 2013
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index d4ecb64bc..1c75531d8 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3964,6 +3964,8 @@
<_description>Norwegian</_description>
<languageList>
<iso639Id>nor</iso639Id>
+ <iso639Id>nob</iso639Id>
+ <iso639Id>nno</iso639Id>
</languageList>
</configItem>
<variantList>