Changeset ddb844e in mainline for uspace/lib/c/include/io/kbd_event.h

Timestamp:

2020-07-03T23:00:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:

• uspace/lib/c/include/io/kbd_event.h (modified) (1 diff)

uspace/lib/c/include/io/kbd_event.h

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <inttypes.h>
 #include <io/keycode.h>