Merge remote-tracking branch 'upstream/master' into martinetd/xdg_shell

This commit is contained in:
emersion 2018-02-16 18:25:58 +01:00
commit 717bdccb6e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
23 changed files with 484 additions and 219 deletions

View file

@ -29,5 +29,5 @@ lib_wlr_types = static_library(
'wlr_xdg_shell.c',
),
include_directories: wlr_inc,
dependencies: [wayland_server, pixman, wlr_protos],
dependencies: [pixman, xkbcommon, wayland_server, wlr_protos],
)