summaryrefslogtreecommitdiffstats
path: root/swaylock
diff options
context:
space:
mode:
authorLibravatar Denis Doria <denisdoria@gmail.com>2016-06-03 00:17:51 +0200
committerLibravatar Denis Doria <denisdoria@gmail.com>2016-06-03 00:17:51 +0200
commit8a08e831947c8feecf8e79ecf21279c950ae419a (patch)
tree634c9197d6dd1dfebbb124d797f5c13b1c605a92 /swaylock
parentFix output command when varible not set (diff)
parentMerge pull request #692 from zandrmartin/inplace-merge-sort (diff)
downloadsway-8a08e831947c8feecf8e79ecf21279c950ae419a.tar.gz
sway-8a08e831947c8feecf8e79ecf21279c950ae419a.tar.zst
sway-8a08e831947c8feecf8e79ecf21279c950ae419a.zip
Merge branch 'master' into variables_corner_cases
Diffstat (limited to 'swaylock')
0 files changed, 0 insertions, 0 deletions