diff options
author | 2016-09-02 13:46:19 -0500 | |
---|---|---|
committer | 2016-09-02 13:46:19 -0500 | |
commit | 79ffea328c992c5109406771a59a9f016d85970d (patch) | |
tree | 5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /swaylock/main.c | |
parent | refactor commands.c (diff) | |
parent | Merge pull request #878 from lukaslihotzki/master (diff) | |
download | sway-79ffea328c992c5109406771a59a9f016d85970d.tar.gz sway-79ffea328c992c5109406771a59a9f016d85970d.tar.zst sway-79ffea328c992c5109406771a59a9f016d85970d.zip |
Merge branch 'master' of git://github.com/SirCmpwn/sway into commands-refactor
Diffstat (limited to 'swaylock/main.c')
-rw-r--r-- | swaylock/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 3049934e..0637453c 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -12,13 +12,12 @@ | |||
12 | #include <signal.h> | 12 | #include <signal.h> |
13 | #include <stdbool.h> | 13 | #include <stdbool.h> |
14 | #include <unistd.h> | 14 | #include <unistd.h> |
15 | |||
16 | #include "client/window.h" | 15 | #include "client/window.h" |
17 | #include "client/registry.h" | 16 | #include "client/registry.h" |
18 | #include "client/cairo.h" | 17 | #include "client/cairo.h" |
18 | #include "swaylock/swaylock.h" | ||
19 | #include "ipc-client.h" | 19 | #include "ipc-client.h" |
20 | #include "log.h" | 20 | #include "log.h" |
21 | #include "lock/lock.h" | ||
22 | 21 | ||
23 | struct registry *registry; | 22 | struct registry *registry; |
24 | struct render_data render_data; | 23 | struct render_data render_data; |