Merge tag 'xrandr_branch_point' into wayland-kms-base

Conflicts:
	src/Makefile.am
	src/core/display.c
	src/core/screen-private.h
	src/core/screen.c
This commit is contained in:
Giovanni Campagna
2013-08-27 10:07:39 +02:00
25 changed files with 6128 additions and 307 deletions

View File

@@ -179,7 +179,7 @@ struct _MetaWindow
* been overridden (via a client message), the window will cover the union of
* these monitors. If not, this is the single monitor which the window's
* origin is on. */
long fullscreen_monitors[4];
gint fullscreen_monitors[4];
/* Whether we're trying to constrain the window to be fully onscreen */
guint require_fully_onscreen : 1;