projects / platform / upstream / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d06968 b9d345b)
Merge pull request #1695 from evverx/fix-cap-bounding-merging
authorLennart Poettering <lennart@poettering.net>
Tue, 27 Oct 2015 16:09:05 +0000 (17:09 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 27 Oct 2015 16:09:05 +0000 (17:09 +0100)
core: fix CapabilityBoundingSet merging

1  2 
src/core/load-fragment.c patch | diff1 | diff2 | blob | history

diff --cc src/core/load-fragment.c
Simple merge
Domain: System / System Framework;