summaryrefslogtreecommitdiff
path: root/Makefrag.am
diff options
context:
space:
mode:
authorAlmuHS <liberamenso10000@gmail.com>2018-12-31 02:13:08 +0100
committerAlmuHS <liberamenso10000@gmail.com>2018-12-31 02:13:08 +0100
commit46a6dc3a9b88d3cd7522c480384dad502c49227c (patch)
tree163021a3639f360c5605bcedd752d3b1ef6fdfd4 /Makefrag.am
parent6216e74dd0d961915edee69098f6e8d27a4ba896 (diff)
parent70ddda0f41b3b13a5a3b5179447712f7af8fb574 (diff)
fix conflict
Diffstat (limited to 'Makefrag.am')
-rw-r--r--Makefrag.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefrag.am b/Makefrag.am
index 8b855cb8..64a76c8e 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -422,6 +422,7 @@ include_mach_HEADERS = \
include/mach/vm_param.h \
include/mach/vm_prot.h \
include/mach/vm_statistics.h \
+ include/mach/vm_sync.h \
include/mach/vm_wire.h \
include/mach/inline.h \
include/mach/xen.h