diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 15:55:01 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 15:55:01 -0400 |
| commit | 0b083d1977f410c8065e9d1f2534c83c58bfc907 (patch) | |
| tree | 6b2f479626bfe02ec38bf6f13e3506fbfc387965 /src/libbasic/hostname-util.c | |
| parent | 06cbbe0055ad8af01226a4f50470d139fe8c94d1 (diff) | |
| parent | c5b004f177571982989505c4aeef9c57af3353bd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/journal/Makefile
# src/libsystemd/Makefile
# src/libsystemd/libsystemd-internal/Makefile
# src/libsystemd/libsystemd-journal-internal/Makefile
Diffstat (limited to 'src/libbasic/hostname-util.c')
0 files changed, 0 insertions, 0 deletions