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/main.c | |
| parent | d8104db8f1820bd3d4db8bf4f1ee51ae334ee6e7 (diff) | |
| parent | 7162b9bea4d66d61376ad3605e23e2d83bb95201 (diff) | |
Merge remote-tracking branch 'origin/wlroots' into swaybar-layers
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/main.c b/sway/main.c index f2f24be3..ded922ee 100644 --- a/sway/main.c +++ b/sway/main.c @@ -18,7 +18,7 @@ #include <wlr/util/log.h> #include "sway/config.h" #include "sway/server.h" -#include "sway/layout.h" +#include "sway/tree/layout.h" #include "sway/ipc-server.h" #include "ipc-client.h" #include "readline.h" @@ -382,7 +382,7 @@ int main(int argc, char **argv) { wlr_log(L_INFO, "Starting sway version " SWAY_VERSION); - init_layout(); + layout_init(); if (!server_init(&server)) { return 1; |