diff options
author | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 14:11:48 -0500 |
---|---|---|
committer | Zandr Martin <zandrmartin@gmail.com> | 2016-09-02 14:11:48 -0500 |
commit | 65ace5dec5c24695501056376e227fb9b1f84a3a (patch) | |
tree | e5bae8ecc19c438091478ad878a8297252c72a81 /sway/commands/border.c | |
parent | Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor (diff) | |
download | sway-65ace5dec5c24695501056376e227fb9b1f84a3a.tar.gz sway-65ace5dec5c24695501056376e227fb9b1f84a3a.tar.zst sway-65ace5dec5c24695501056376e227fb9b1f84a3a.zip |
merge in latest commits
Diffstat (limited to 'sway/commands/border.c')
-rw-r--r-- | sway/commands/border.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c index 30798c6d..68ae58a6 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c | |||
@@ -1,9 +1,9 @@ | |||
1 | #include <errno.h> | 1 | #include <errno.h> |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include "commands.h" | 4 | #include "sway/commands.h" |
5 | #include "container.h" | 5 | #include "sway/container.h" |
6 | #include "focus.h" | 6 | #include "sway/focus.h" |
7 | 7 | ||
8 | struct cmd_results *cmd_border(int argc, char **argv) { | 8 | struct cmd_results *cmd_border(int argc, char **argv) { |
9 | struct cmd_results *error = NULL; | 9 | struct cmd_results *error = NULL; |