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/config.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/config.c')
| -rw-r--r-- | sway/config.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/config.c b/sway/config.c index bed233bd..a187fe3e 100644 --- a/sway/config.c +++ b/sway/config.c @@ -12,17 +12,17 @@ #include <limits.h> #include <float.h> #include "wayland-desktop-shell-server-protocol.h" +#include "sway/commands.h" +#include "sway/config.h" +#include "sway/layout.h" +#include "sway/input_state.h" +#include "sway/criteria.h" +#include "sway/input.h" +#include "sway/border.h" #include "readline.h" #include "stringop.h" #include "list.h" #include "log.h" -#include "commands.h" -#include "config.h" -#include "layout.h" -#include "input_state.h" -#include "criteria.h" -#include "input.h" -#include "border.h" struct sway_config *config = NULL; |