diff options
author | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
---|---|---|
committer | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 13:46:19 -0500 |
commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /sway/container.c | |
parent | b374c35758777f98e5ddbe4b0dc43bd7c80f36d7 (diff) | |
parent | 4e6d7b125895955e3a84583c6d61f3eb2f8a4fe9 (diff) | |
download | sway-79ffea328c992c5109406771a59a9f016d85970d.tar.xz |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'sway/container.c')
-rw-r--r-- | sway/container.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sway/container.c b/sway/container.c index c922bac3..5614293c 100644 --- a/sway/container.c +++ b/sway/container.c @@ -3,17 +3,17 @@ #include <stdbool.h> #include <strings.h> #include <string.h> -#include "config.h" -#include "stringop.h" -#include "container.h" -#include "workspace.h" -#include "focus.h" -#include "border.h" -#include "layout.h" -#include "input_state.h" +#include "sway/config.h" +#include "sway/container.h" +#include "sway/workspace.h" +#include "sway/focus.h" +#include "sway/border.h" +#include "sway/layout.h" +#include "sway/input_state.h" +#include "sway/ipc-server.h" +#include "sway/output.h" #include "log.h" -#include "ipc-server.h" -#include "output.h" +#include "stringop.h" #define ASSERT_NONNULL(PTR) \ sway_assert (PTR, #PTR "must be non-null") |