]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e48712 ee48dbd)
Merge pull request #490 from pyssling/master
authorLennart Poettering <lennart@poettering.net>
Tue, 12 Jan 2016 22:30:20 +0000 (23:30 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Jan 2016 22:30:20 +0000 (23:30 +0100)
Add machine-id setting

1  2 
src/core/main.c patch | diff1 | diff2 | blob | history

diff --cc src/core/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.