Merge branch 'master' into wlroots-1243

This commit is contained in:
Drew DeVault 2018-09-14 20:56:50 -04:00 committed by GitHub
commit b4d60da856
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 17 deletions

View file

@ -16,7 +16,7 @@
#include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_server_decoration.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_xdg_output.h>
#include <wlr/types/wlr_xdg_output_v1.h>
#include <wlr/util/log.h>
#include "list.h"
#include "sway/config.h"