projects / platform / upstream / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d56cc29 c2c940b)
Merge pull request #1055 from poettering/dhcp-updates
authorTom Gundersen <teg@jklm.no>
Thu, 27 Aug 2015 19:38:36 +0000 (21:38 +0200)
committerTom Gundersen <teg@jklm.no>
Thu, 27 Aug 2015 19:38:36 +0000 (21:38 +0200)
Various networkd and dhcp updates

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
src/libsystemd/sd-bus/bus-message.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc src/libsystemd/sd-bus/bus-message.c
Simple merge
Domain: System / System Framework;