Merge branch 'wlroots' into multibackend

This commit is contained in:
Tony Crisci 2017-12-29 07:52:38 -05:00
commit 9a099d7533
7 changed files with 314 additions and 222 deletions

View file

@ -397,7 +397,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);