~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/include/common/mir/input/xkb_mapper.h

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
#ifndef MIR_INPUT_RECEIVER_XKB_MAPPER_H_
20
20
#define MIR_INPUT_RECEIVER_XKB_MAPPER_H_
21
21
 
 
22
#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
23
 
22
24
#include "mir_toolkit/event.h"
23
25
 
24
26
#include <xkbcommon/xkbcommon.h>