diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-20 15:50:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-20 15:50:51 -0400 |
commit | 54445caefb8396269344d430b69d9d1e0796271d (patch) | |
tree | 0debcc2b345c0677a0826730fc553db2132cfda8 /protocols/meson.build | |
parent | a3d3c819cf38d7a04f79f6d5b16e11ac0a786135 (diff) | |
parent | cab0dd8281daecfb4ef2452fddc4b7aae9143fb7 (diff) |
Merge branch 'master' into fix-focus-follows-mouse
Diffstat (limited to 'protocols/meson.build')
-rw-r--r-- | protocols/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/protocols/meson.build b/protocols/meson.build index 9966c02f..a031245c 100644 --- a/protocols/meson.build +++ b/protocols/meson.build @@ -29,16 +29,18 @@ wayland_scanner_server = generator( client_protocols = [ [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], + [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], ['idle.xml'], - ['wlr-input-inhibitor-unstable-v1.xml'] + ['wlr-input-inhibitor-unstable-v1.xml'], ] server_protocols = [ [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], + [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'], ['wlr-layer-shell-unstable-v1.xml'], - ['wlr-input-inhibitor-unstable-v1.xml'] + ['wlr-input-inhibitor-unstable-v1.xml'], ] client_protos_src = [] |