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/client.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/client.c')
| -rw-r--r-- | sway/commands/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/client.c b/sway/commands/client.c index 993fa2f8..7954f670 100644 --- a/sway/commands/client.c +++ b/sway/commands/client.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
| 2 | #include <string.h> | 2 | #include <string.h> |
| 3 | #include "commands.h" | 3 | #include "sway/commands.h" |
| 4 | 4 | ||
| 5 | static struct cmd_results *parse_border_color(struct border_colors *border_colors, const char *cmd_name, int argc, char **argv) { | 5 | static struct cmd_results *parse_border_color(struct border_colors *border_colors, const char *cmd_name, int argc, char **argv) { |
| 6 | struct cmd_results *error = NULL; | 6 | struct cmd_results *error = NULL; |