diff options
| author |  Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-05-14 00:28:21 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-14 00:28:21 -0400 |
| commit | 34b864fb1752fde2528db6aa86d53c23412a8f43 (patch) | |
| tree | b387f1e1eb8f8fc16faeb4bf24a0ab6e8ba5787c /protocols/meson.build | |
| parent | Fix titles and detect edges for hide_edge_borders (diff) | |
| parent | Actually fix swayidle (diff) | |
| download | sway-34b864fb1752fde2528db6aa86d53c23412a8f43.tar.gz sway-34b864fb1752fde2528db6aa86d53c23412a8f43.tar.zst sway-34b864fb1752fde2528db6aa86d53c23412a8f43.zip | |
Merge branch 'master' into fix-1975
Diffstat (limited to 'protocols/meson.build')
| -rw-r--r-- | protocols/meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/protocols/meson.build b/protocols/meson.build index 9d213f81..9966c02f 100644 --- a/protocols/meson.build +++ b/protocols/meson.build | |||
| @@ -30,10 +30,12 @@ wayland_scanner_server = generator( | |||
| 30 | client_protocols = [ | 30 | client_protocols = [ |
| 31 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | 31 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], |
| 32 | ['wlr-layer-shell-unstable-v1.xml'], | 32 | ['wlr-layer-shell-unstable-v1.xml'], |
| 33 | ['idle.xml'], | ||
| 33 | ['wlr-input-inhibitor-unstable-v1.xml'] | 34 | ['wlr-input-inhibitor-unstable-v1.xml'] |
| 34 | ] | 35 | ] |
| 35 | 36 | ||
| 36 | server_protocols = [ | 37 | server_protocols = [ |
| 38 | [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], | ||
| 37 | [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], | 39 | [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], |
| 38 | ['wlr-layer-shell-unstable-v1.xml'], | 40 | ['wlr-layer-shell-unstable-v1.xml'], |
| 39 | ['wlr-input-inhibitor-unstable-v1.xml'] | 41 | ['wlr-input-inhibitor-unstable-v1.xml'] |