diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-09-14 20:56:50 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-14 20:56:50 -0400 |
| commit | b4d60da8568c59e6aaf8995d737d587da88c2cbf (patch) | |
| tree | 1f71cb868579ee7b0331435eee4f62592f9ab9d8 /sway/server.c | |
| parent | Update for swaywm/wlroots#1243 (diff) | |
| parent | Postfix xdg-output headers (diff) | |
| download | sway-b4d60da8568c59e6aaf8995d737d587da88c2cbf.tar.gz sway-b4d60da8568c59e6aaf8995d737d587da88c2cbf.tar.zst sway-b4d60da8568c59e6aaf8995d737d587da88c2cbf.zip | |
Merge branch 'master' into wlroots-1243
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c index 58843944..9440c10f 100644 --- a/sway/server.c +++ b/sway/server.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <wlr/types/wlr_screencopy_v1.h> | 16 | #include <wlr/types/wlr_screencopy_v1.h> |
| 17 | #include <wlr/types/wlr_server_decoration.h> | 17 | #include <wlr/types/wlr_server_decoration.h> |
| 18 | #include <wlr/types/wlr_xcursor_manager.h> | 18 | #include <wlr/types/wlr_xcursor_manager.h> |
| 19 | #include <wlr/types/wlr_xdg_output.h> | 19 | #include <wlr/types/wlr_xdg_output_v1.h> |
| 20 | #include <wlr/util/log.h> | 20 | #include <wlr/util/log.h> |
| 21 | #include "list.h" | 21 | #include "list.h" |
| 22 | #include "sway/config.h" | 22 | #include "sway/config.h" |