diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:50:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:50:56 -0400 |
| commit | 9cf3c290c9345409a9875dc1a7d17528abfcd916 (patch) | |
| tree | c7b391acb4c6e9c155eab28d5207e78bd23b2c0b /src/libsystemd-basic/include/systemd-basic/hostname-util.h | |
| parent | 4edbbb28e4419fc473d5675abd6abd0c450ca82c (diff) | |
| parent | 5d31f69302e974cd7c213b194c0bbbf11008c2de (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-resolve/systemd-resolved/Makefile
# src/libsystemd/Makefile
# src/libsystemd/src/Makefile
Diffstat (limited to 'src/libsystemd-basic/include/systemd-basic/hostname-util.h')
0 files changed, 0 insertions, 0 deletions