summaryrefslogtreecommitdiffstats
path: root/swaybar/status_line.c
diff options
context:
space:
mode:
authorLibravatar Zandr Martin <zandrmartin@gmail.com>2016-09-02 13:46:19 -0500
committerLibravatar Zandr Martin <zandrmartin@gmail.com>2016-09-02 13:46:19 -0500
commit79ffea328c992c5109406771a59a9f016d85970d (patch)
tree5d965e72127f227ea0a38dc5c6e4fc14e08d9498 /swaybar/status_line.c
parentrefactor commands.c (diff)
parentMerge pull request #878 from lukaslihotzki/master (diff)
downloadsway-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/status_line.c')
-rw-r--r--swaybar/status_line.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 33a8908f..c7055d4c 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -3,9 +3,9 @@
3#include <unistd.h> 3#include <unistd.h>
4#include <json-c/json.h> 4#include <json-c/json.h>
5 5
6#include "swaybar/config.h"
7#include "swaybar/status_line.h"
6#include "log.h" 8#include "log.h"
7#include "bar/config.h"
8#include "bar/status_line.h"
9#include "util.h" 9#include "util.h"
10 10
11#define I3JSON_MAXDEPTH 4 11#define I3JSON_MAXDEPTH 4