Merge branch 'master' into session

This commit is contained in:
ascent12 2017-06-01 23:10:19 +12:00 committed by GitHub
commit 62d612a01e
14 changed files with 133 additions and 90 deletions

View file

@ -55,7 +55,6 @@ struct wlr_output_state {
};
void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on);
void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data);