~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/unit-tests/client/test_mir_prompt_session.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 * Authored by: Nick Dedekind <nick.dedekind <nick.dedekind@canonical.com>
17
17
 */
18
18
 
 
19
#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
20
 
19
21
#include "src/client/mir_prompt_session.h"
20
22
#include "src/client/mir_event_distributor.h"
21
23