~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to playground/demo-shell/window_manager.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 *              Daniel van Vugt <daniel.van.vugt@canonical.com>
18
18
 */
19
19
 
 
20
#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER 
 
21
 
20
22
#include "window_manager.h"
21
23
#include "demo_compositor.h"
22
24