Merge branch 'master' into seat-views

This commit is contained in:
emersion 2017-11-19 17:56:26 +01:00
commit 76e8e1a6ad
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
11 changed files with 125 additions and 215 deletions

View file

@ -50,6 +50,7 @@ struct roots_desktop {
#ifdef HAS_XWAYLAND
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
#endif
};