Merge branch 'wlroots' into bindings

This commit is contained in:
Tony Crisci 2018-01-04 08:00:22 -05:00
commit b01a53abfb
6 changed files with 278 additions and 252 deletions

View file

@ -398,7 +398,7 @@ struct seat_attachment_config *seat_config_get_attachment(
void apply_seat_config(struct seat_config *seat);
int output_name_cmp(const void *item, const void *data);
struct output_config *new_output_config();
struct output_config *new_output_config(const char *name);
void merge_output_config(struct output_config *dst, struct output_config *src);
void apply_output_config(struct output_config *oc, swayc_t *output);
void free_output_config(struct output_config *oc);