]> git.ipfire.org Git - thirdparty/systemd.git/commit
Merge pull request #8184 from poettering/color-ask-pw
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Feb 2018 16:14:59 +0000 (17:14 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 15 Feb 2018 16:14:59 +0000 (17:14 +0100)
commit730f40eb5789efe59cf105e898297d188cd0588b
treeabf1f4b786902ee0497a92aa6b617cbf8ad1802f
parent648461c07dbe722b1298686a3b35d339a5fa5ab0
parent1496ceaf301835497cde6e7a74ef90f21893566c
Merge pull request #8184 from poettering/color-ask-pw

Trivial merge conflict resolved locally.
.mkosi/mkosi.fedora
TODO
src/basic/process-util.c