projects / platform / upstream / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 132bdb0 c542f80)
Merge pull request #2469 from keszybz/resolved-2
authorLennart Poettering <lennart@poettering.net>
Sat, 30 Jan 2016 14:04:56 +0000 (15:04 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 30 Jan 2016 14:04:56 +0000 (15:04 +0100)
Resolved 2

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
man/resolved.conf.xml patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc man/resolved.conf.xml
Simple merge
Domain: System / System Framework;