Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-23 16:26:20 +10:00
commit b11c9199a6
4 changed files with 31 additions and 10 deletions

View file

@ -54,6 +54,8 @@ struct sway_server {
struct sway_server server;
/* Prepares an unprivileged server_init by performing all privileged operations in advance */
bool server_privileged_prepare(struct sway_server *server);
bool server_init(struct sway_server *server);
void server_fini(struct sway_server *server);
void server_run(struct sway_server *server);