diff options
author | 2016-07-02 08:14:40 -0500 | |
---|---|---|
committer | 2016-07-02 08:14:40 -0500 | |
commit | 034410819d4c8ea28105c5a5eef0563635a36a9d (patch) | |
tree | f24f60afd5ee641bddc78e6b16a8035e3abf7469 /swaylock/main.c | |
parent | Merge branch 'set-size-command' of github.com:zandrmartin/sway into set-size-... (diff) | |
parent | Spawn windows as floating if they have a parent (diff) | |
download | sway-034410819d4c8ea28105c5a5eef0563635a36a9d.tar.gz sway-034410819d4c8ea28105c5a5eef0563635a36a9d.tar.zst sway-034410819d4c8ea28105c5a5eef0563635a36a9d.zip |
Merge remote-tracking branch 'upstream/master' into set-size-command
Diffstat (limited to 'swaylock/main.c')
-rw-r--r-- | swaylock/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index b5ce63ef..a0a2f1cb 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <getopt.h> | 11 | #include <getopt.h> |
12 | #include <signal.h> | 12 | #include <signal.h> |
13 | #include <stdbool.h> | 13 | #include <stdbool.h> |
14 | #include <unistd.h> | ||
14 | 15 | ||
15 | #include "client/window.h" | 16 | #include "client/window.h" |
16 | #include "client/registry.h" | 17 | #include "client/registry.h" |