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 /swaybar/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 'swaybar/main.c')
-rw-r--r-- | swaybar/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/main.c b/swaybar/main.c index d7534f5d..c9a554a3 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -3,9 +3,9 @@ | |||
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
5 | #include <getopt.h> | 5 | #include <getopt.h> |
6 | #include "swaybar/bar.h" | ||
6 | #include "ipc-client.h" | 7 | #include "ipc-client.h" |
7 | #include "log.h" | 8 | #include "log.h" |
8 | #include "bar/bar.h" | ||
9 | 9 | ||
10 | /* global bar state */ | 10 | /* global bar state */ |
11 | struct bar swaybar; | 11 | struct bar swaybar; |