Merge branch 'master' into fix-1975

This commit is contained in:
Brian Ashworth 2018-05-14 09:06:23 -04:00 committed by GitHub
commit 9ba0dca7ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 747 additions and 742 deletions

View file

@ -11,7 +11,6 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include <wlr/util/region.h>
#include "log.h"
#include "sway/config.h"