diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /xorg-server/xkeyboard-config/rules | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 712ddabf6..313f4884d 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1372,6 +1372,12 @@ <iso639Id>srp</iso639Id> </languageList> </configItem> </variant> + <variant> + <configItem> + <name>workman</name> + <_description>English (US, Workman)</_description> + </configItem> + </variant> </variantList> </layout> <layout> |