diff options
author | 2018-05-12 09:01:16 -0400 | |
---|---|---|
committer | 2018-05-12 09:01:16 -0400 | |
commit | 2da685e913432716f55cd537fd3d64f3fb3cc09a (patch) | |
tree | c986cca12ecdb3e3ac4d94d38205028788315889 /swaylock | |
parent | Merge branch 'master' into scdoc (diff) | |
parent | Merge pull request #1959 from RyanDwyer/ipc-get-seats (diff) | |
download | sway-2da685e913432716f55cd537fd3d64f3fb3cc09a.tar.gz sway-2da685e913432716f55cd537fd3d64f3fb3cc09a.tar.zst sway-2da685e913432716f55cd537fd3d64f3fb3cc09a.zip |
Merge remote-tracking branch 'origin/master' into scdoc
Diffstat (limited to 'swaylock')
0 files changed, 0 insertions, 0 deletions