diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
| commit | d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch) | |
| tree | 4444227f247f9b7cdb854144eb4332e607c34987 /include/swaygrab | |
| parent | Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15 (diff) | |
| download | sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.gz sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.zst sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.zip | |
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing
changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
Diffstat (limited to 'include/swaygrab')
| -rw-r--r-- | include/swaygrab/json.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h index c0bd8587..c1093ef1 100644 --- a/include/swaygrab/json.h +++ b/include/swaygrab/json.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "sway_json_helper.h" | 1 | #include <json-c/json.h> |
| 2 | #include "wlc/wlc.h" | 2 | #include "wlc/wlc.h" |
| 3 | 3 | ||
| 4 | void init_json_tree(int socketfd); | 4 | void init_json_tree(int socketfd); |