diff options
author | Zandr Martin <[email protected]> | 2016-09-02 13:46:19 -0500 |
---|---|---|
committer | Zandr Martin <[email protected]> | 2016-09-02 13:46:19 -0500 |
commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /sway/main.c | |
parent | b374c35758777f98e5ddbe4b0dc43bd7c80f36d7 (diff) | |
parent | 4e6d7b125895955e3a84583c6d61f3eb2f8a4fe9 (diff) |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'sway/main.c')
-rw-r--r-- | sway/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sway/main.c b/sway/main.c index 51b12d20..972b260b 100644 --- a/sway/main.c +++ b/sway/main.c @@ -8,17 +8,17 @@ #include <signal.h> #include <unistd.h> #include <getopt.h> -#include "extensions.h" -#include "layout.h" -#include "stringop.h" -#include "config.h" -#include "log.h" -#include "readline.h" -#include "handlers.h" +#include "sway/extensions.h" +#include "sway/layout.h" +#include "sway/config.h" +#include "sway/handlers.h" +#include "sway/input.h" +#include "sway/ipc-server.h" #include "ipc-client.h" -#include "ipc-server.h" -#include "input.h" +#include "readline.h" +#include "stringop.h" #include "sway.h" +#include "log.h" static bool terminate_request = false; static int exit_value = 0; |