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/include.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/include.c')
| -rw-r--r-- | sway/commands/include.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/include.c b/sway/commands/include.c index e5f0a7ec..1ba9a10d 100644 --- a/sway/commands/include.c +++ b/sway/commands/include.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #include "commands.h" | 1 | #include "sway/commands.h" |
| 2 | #include "config.h" | 2 | #include "sway/config.h" |
| 3 | 3 | ||
| 4 | struct cmd_results *cmd_include(int argc, char **argv) { | 4 | struct cmd_results *cmd_include(int argc, char **argv) { |
| 5 | struct cmd_results *error = NULL; | 5 | struct cmd_results *error = NULL; |