diff options
| author | emersion <contact@emersion.fr> | 2018-03-15 15:48:09 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-03-15 15:48:09 +0100 |
| commit | 8b58e1a3ad45f3e791a15b070d5544f3fc4e6a7e (patch) | |
| tree | b97fdf2deb525a5bc919bac3e410a905b0ef4821 /protocol | |
| parent | 824a95ad19062e867178593f0937d14049422989 (diff) | |
| parent | de0e40d621c51cf075825633946a9ac7f98ac213 (diff) | |
Merge branch 'master' into matrix-redesign
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/protocol/meson.build b/protocol/meson.build index 6c87a887..638b0c46 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -21,9 +21,10 @@ wayland_scanner_client = generator( ) protocols = [ - [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'], [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'], + [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'], + [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'], 'gamma-control.xml', 'gtk-primary-selection.xml', 'idle.xml', |