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

This commit is contained in:
Ryan Dwyer 2018-06-29 20:04:24 +10:00
commit a2fbb20a61
16 changed files with 193 additions and 74 deletions

View file

@ -153,6 +153,7 @@ sway_deps = [
server_protos,
wayland_server,
wlroots,
xcb,
xkbcommon,
]