Ignore:
Timestamp:
2014-10-09T03:34:21Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ef3da5a
Parents:
fa65df1 (diff), 18cc83c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/compositor/compositor.c

    rfa65df1 r6eb957dc  
    18201820        bool viewport_change = (mods & KM_ALT) && (
    18211821            key == KC_O || key == KC_P);
    1822         bool kconsole_switch = (mods & KM_ALT) && (key == KC_M);
     1822        bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK);
    18231823        bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
    18241824
Note: See TracChangeset for help on using the changeset viewer.