diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:41:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:41:36 -0400 |
| commit | e79b48788853612eeadb7874df1e5968220c5c66 (patch) | |
| tree | 85802c0546845a4e18d89de23a2a459aaec61a23 | |
| parent | ea1c03eb779c4f9f642540f5d01a01c6be6a0831 (diff) | |
| parent | beecc7efdb7b1a01e82708f32a1c18c0e4bef43f (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
| -rwxr-xr-x | move.sh | 1 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/machined.h (renamed from src/grp-machine/systemd-machined/machined.h) | 0 |
2 files changed, 0 insertions, 1 deletions
@@ -87,7 +87,6 @@ move_files() ( mv -T src/machine src/grp-machine/libmachine-core mkdir src/grp-machine/systemd-machined mv -T src/grp-machine/{libmachine-core,systemd-machined}/machined.c - mv -T src/grp-machine/{libmachine-core,systemd-machined}/machined.h mkdir src/grp-machine/machinectl mv -T src/grp-machine/{libmachine-core,machinectl}/machinectl.c mv -T src/{,grp-machine}/nss-mymachines diff --git a/src/grp-machine/systemd-machined/machined.h b/src/grp-machine/libmachine-core/machined.h index 0fe50aaa66..0fe50aaa66 100644 --- a/src/grp-machine/systemd-machined/machined.h +++ b/src/grp-machine/libmachine-core/machined.h |