aboutsummaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorBrian Ashworth <RedSoxFan@users.noreply.github.com>2018-05-20 09:37:49 -0400
committerGitHub <noreply@github.com>2018-05-20 09:37:49 -0400
commitaacde78dafb52f2c33ced64cb7b9bf17d1d8bcbe (patch)
tree561bce67d6264278683ec481ba9c9979d0754735 /protocols
parent750a497a8b5cf7c1ec8c46db7d7a531fcfb1a86f (diff)
parentcab0dd8281daecfb4ef2452fddc4b7aae9143fb7 (diff)
Merge branch 'master' into premultiply-alpha
Diffstat (limited to 'protocols')
-rw-r--r--protocols/meson.build6
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 = []