diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/KeyUtil.cc | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/KeyUtil.cc')
| -rw-r--r-- | src/FbTk/KeyUtil.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc index c30dc8e..0578b9c 100644 --- a/src/FbTk/KeyUtil.cc +++ b/src/FbTk/KeyUtil.cc | |||
| @@ -50,10 +50,12 @@ const struct t_modlist modlist[] = { | |||
| 50 | {"MOD3", Mod3Mask}, | 50 | {"MOD3", Mod3Mask}, |
| 51 | {"MOD4", Mod4Mask}, | 51 | {"MOD4", Mod4Mask}, |
| 52 | {"MOD5", Mod5Mask}, | 52 | {"MOD5", Mod5Mask}, |
| 53 | {"ALT", Mod1Mask}, | ||
| 54 | {"CTRL", ControlMask}, | ||
| 53 | {0, 0} | 55 | {0, 0} |
| 54 | }; | 56 | }; |
| 55 | 57 | ||
| 56 | }; | 58 | } |
| 57 | 59 | ||
| 58 | namespace FbTk { | 60 | namespace FbTk { |
| 59 | 61 | ||