diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-04 07:32:25 -0500 |
commit | 0896b6867536e7c12e5345ca5df94b9467c8bf24 (patch) | |
tree | 2240f512d2e55102b2ad16b4ff13a6c8124947d9 /sway/meson.build | |
parent | xwayland shell (diff) | |
parent | Merge pull request #1493 from acrisci/feature/wl-shell (diff) | |
download | sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.gz sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.tar.zst sway-0896b6867536e7c12e5345ca5df94b9467c8bf24.zip |
Merge branch 'wlroots' into feature/xwayland
Diffstat (limited to 'sway/meson.build')
-rw-r--r-- | sway/meson.build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sway/meson.build b/sway/meson.build index e8e9013f..9f92f5d1 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -6,6 +6,7 @@ sway_sources = files( | |||
6 | 'ipc-json.c', | 6 | 'ipc-json.c', |
7 | 'ipc-server.c', | 7 | 'ipc-server.c', |
8 | 'desktop/output.c', | 8 | 'desktop/output.c', |
9 | 'desktop/wl_shell.c', | ||
9 | 'desktop/xdg_shell_v6.c', | 10 | 'desktop/xdg_shell_v6.c', |
10 | 'desktop/xwayland.c', | 11 | 'desktop/xwayland.c', |
11 | 'tree/container.c', | 12 | 'tree/container.c', |