Ignore:
Timestamp:
2011-06-10T19:33:41Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1878386
Parents:
13ecdac9 (diff), 79a141a (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:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/kbd/layout/us_dvorak.c

    r13ecdac9 r1affcdf3  
    3838
    3939static void layout_reset(void);
    40 static wchar_t layout_parse_ev(console_event_t *ev);
     40static wchar_t layout_parse_ev(kbd_event_t *ev);
    4141
    4242layout_op_t us_dvorak_op = {
     
    210210}
    211211
    212 static wchar_t layout_parse_ev(console_event_t *ev)
     212static wchar_t layout_parse_ev(kbd_event_t *ev)
    213213{
    214214        wchar_t c;
Note: See TracChangeset for help on using the changeset viewer.