Merge branch 'master' into bar_hiding

This commit is contained in:
calvinkosmatka 2017-04-12 03:24:28 -05:00 committed by GitHub
commit 89da85605f
5 changed files with 248 additions and 17 deletions

View file

@ -10,5 +10,6 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar);
json_object *ipc_json_describe_container(swayc_t *c);
json_object *ipc_json_describe_container_recursive(swayc_t *c);
json_object *ipc_json_describe_window(swayc_t *c);
json_object *ipc_json_describe_input(struct libinput_device *device);
#endif