summaryrefslogtreecommitdiff
path: root/libnm
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-04-19 13:04:29 +0200
committerThomas Haller <thaller@redhat.com>2016-04-19 13:08:13 +0200
commit3f230c1ad8252c62745b5e92a137482cbac10b10 (patch)
tree84b413c145856d49b26a80f73034280288286eb0 /libnm
parenta5f794ac0fcba47004ba23027dda108db1419284 (diff)
parent38abb711f52e4dfde57923721c9eefe42579e196 (diff)
downloadNetworkManager-3f230c1ad8252c62745b5e92a137482cbac10b10.tar.gz
merge: merge branch 'systemd' into master
Diffstat (limited to 'libnm')
0 files changed, 0 insertions, 0 deletions