Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-11 11:03:43 +10:00
commit 9e96cfd310
17 changed files with 507 additions and 41 deletions

View file

@ -45,6 +45,7 @@ sway_sources = files(
'commands/for_window.c',
'commands/force_focus_wrapping.c',
'commands/fullscreen.c',
'commands/gaps.c',
'commands/hide_edge_borders.c',
'commands/kill.c',
'commands/mark.c',
@ -65,6 +66,7 @@ sway_sources = files(
'commands/seat/fallback.c',
'commands/set.c',
'commands/show_marks.c',
'commands/smart_gaps.c',
'commands/split.c',
'commands/sticky.c',
'commands/swaybg_command.c',