Merge branch 'master' into leaks

This commit is contained in:
emersion 2018-07-06 16:22:13 +01:00 committed by GitHub
commit b3c55dd909
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 60 additions and 37 deletions

View file

@ -50,6 +50,7 @@ struct sway_mode {
char *name;
list_t *keysym_bindings;
list_t *keycode_bindings;
bool pango;
};
struct input_config_mapped_from_region {

View file

@ -15,6 +15,6 @@ void ipc_event_workspace(struct sway_container *old,
struct sway_container *new, const char *change);
void ipc_event_window(struct sway_container *window, const char *change);
void ipc_event_barconfig_update(struct bar_config *bar);
void ipc_event_mode(const char *mode);
void ipc_event_mode(const char *mode, bool pango);
#endif