diff options
author | Zandr Martin <zandrmartin@users.noreply.github.com> | 2016-10-02 22:13:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-02 22:13:40 -0500 |
commit | 09a44263c38dffccf896beb64199a89012a7ef82 (patch) | |
tree | 8c5a209bb34529b5926da59612b05010e835b9e0 /protocols/swaylock.xml | |
parent | 4c0e809028de5efbbfbbbc9685c47b2c0015d56e (diff) | |
parent | 04db58863e38c800c73736df1910b5164cb66db7 (diff) |
Merge branch 'master' into fix-focus-segfault
Diffstat (limited to 'protocols/swaylock.xml')
0 files changed, 0 insertions, 0 deletions