Brian Ashworth 9ba0dca7ba Merge branch 'master' into fix-1975		2018-05-14 09:06:23 -04:00
..
desktop.c	Revert "Break everything^W^WUse wlr_box for sway_container"	2018-04-06 16:13:26 -04:00
layer_shell.c	layer-shell: use usable_area when arranging non-exclusive layer surfaces	2018-05-10 12:19:38 +01:00
output.c	Merge branch 'master' into fix-1975	2018-05-14 09:06:23 -04:00
xdg_shell.c	xdg_shell: Replace get_prop with get_string_prop	2018-05-14 11:47:39 +10:00
xdg_shell_v6.c	Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""	2018-05-14 11:38:09 +10:00
xwayland.c	Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""	2018-05-14 11:38:09 +10:00