diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:02:29 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:04:04 -0400 |
| commit | f26ecd9f58bb672fe107660ce9b37f4bf0777a8c (patch) | |
| tree | 997658454de40db3f8b76b68d658efaf2b686188 /sway/desktop/layer_shell.c | |
| parent | Early return from render functions if necessary (diff) | |
| parent | Merge pull request #1654 from acrisci/refactor-2-electric-boogaloo (diff) | |
| download | sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.gz sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.zst sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.zip | |
Merge remote-tracking branch 'origin/wlroots' into swaybar-layers
Diffstat (limited to 'sway/desktop/layer_shell.c')
| -rw-r--r-- | sway/desktop/layer_shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index bf76b075..f7e5d19c 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <wlr/types/wlr_output.h> | 7 | #include <wlr/types/wlr_output.h> |
| 8 | #include <wlr/util/log.h> | 8 | #include <wlr/util/log.h> |
| 9 | #include "sway/layers.h" | 9 | #include "sway/layers.h" |
| 10 | #include "sway/layout.h" | 10 | #include "sway/tree/layout.h" |
| 11 | #include "sway/output.h" | 11 | #include "sway/output.h" |
| 12 | #include "sway/server.h" | 12 | #include "sway/server.h" |
| 13 | 13 | ||