diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2018-01-04 08:00:22 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-04 08:00:22 -0500 |
| commit | b01a53abfb883f8767090415f1ec37b295b35146 (patch) | |
| tree | 8381c59d4dce5595d923fed9b221640115b84682 /include/sway/config.h | |
| parent | cleanup bindings (diff) | |
| parent | Merge pull request #1546 from 4e554c4c/wlr_logs (diff) | |
| download | sway-b01a53abfb883f8767090415f1ec37b295b35146.tar.gz sway-b01a53abfb883f8767090415f1ec37b295b35146.tar.zst sway-b01a53abfb883f8767090415f1ec37b295b35146.zip | |
Merge branch 'wlroots' into bindings
Diffstat (limited to 'include/sway/config.h')
| -rw-r--r-- | include/sway/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 7146623e..bf047d40 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
| @@ -398,7 +398,7 @@ struct seat_attachment_config *seat_config_get_attachment( | |||
| 398 | void apply_seat_config(struct seat_config *seat); | 398 | void apply_seat_config(struct seat_config *seat); |
| 399 | 399 | ||
| 400 | int output_name_cmp(const void *item, const void *data); | 400 | int output_name_cmp(const void *item, const void *data); |
| 401 | struct output_config *new_output_config(); | 401 | struct output_config *new_output_config(const char *name); |
| 402 | void merge_output_config(struct output_config *dst, struct output_config *src); | 402 | void merge_output_config(struct output_config *dst, struct output_config *src); |
| 403 | void apply_output_config(struct output_config *oc, swayc_t *output); | 403 | void apply_output_config(struct output_config *oc, swayc_t *output); |
| 404 | void free_output_config(struct output_config *oc); | 404 | void free_output_config(struct output_config *oc); |