diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-02 11:13:08 +0200 |
| commit | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (patch) | |
| tree | 33b215c07359fff941f32fc89a8cf3e968d334a9 /xorg-server/xkeyboard-config/symbols/keypad | |
| parent | 1881d1a5c46cc9efb394f84b69f58c000ee1118b (diff) | |
| parent | 8092f320c341a6b3a1b428fdd4473859d5db8b79 (diff) | |
| download | vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.gz vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.tar.bz2 vcxsrv-c3594c6c050a987fb891a1c7cf0c83102fbbec46.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013
Conflicts:
mesalib/src/glsl/ast.h
mesalib/src/glsl/glsl_parser_extras.h
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/keypad')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/keypad | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index 6c41f134f..51ea3f679 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -93,7 +93,7 @@ xkb_symbols "operators" { }; }; -partial hidden default keypad_keys +default partial hidden keypad_keys xkb_symbols "x11" { include "keypad(operators)" |