Commit graph

4 commits

Author SHA1 Message Date
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Rok Garbas b614d72f40 i3lock-fancy: fix patching of the script 2016-05-24 12:38:23 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Rok Garbas e4e7ba281d i3lock-fancy: init at b7196aaff 2016-05-15 05:47:35 +02:00