summaryrefslogtreecommitdiff
path: root/src/grp-machine
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 01:41:36 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 01:41:36 -0400
commite79b48788853612eeadb7874df1e5968220c5c66 (patch)
tree85802c0546845a4e18d89de23a2a459aaec61a23 /src/grp-machine
parentea1c03eb779c4f9f642540f5d01a01c6be6a0831 (diff)
parentbeecc7efdb7b1a01e82708f32a1c18c0e4bef43f (diff)
Merge branch 'lukeshu/postmove' into lukeshu/master
Diffstat (limited to 'src/grp-machine')
-rw-r--r--src/grp-machine/libmachine-core/machined.h (renamed from src/grp-machine/systemd-machined/machined.h)0
1 files changed, 0 insertions, 0 deletions
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