Merge branch 'master' into cursor-scale

This commit is contained in:
emersion 2017-11-12 21:16:45 +01:00
commit 28fc813ca9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
3 changed files with 12 additions and 3 deletions

View file

@ -43,6 +43,7 @@ struct wlr_output {
char name[16];
char make[48];
char model[16];
char serial[16];
uint32_t scale;
int32_t width, height;
int32_t phys_width, phys_height; // mm