Commit 53ed418d authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 6ddeff64 bfbfd603
......@@ -2730,6 +2730,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
cdrom/groklilo/GNUmakefile \
flash/GNUmakefile \
dhcpd/dhcpd.conf.template dhcpd/GNUmakefile \
dhcpd/dhcpd.conf.subboss.template \
install/GNUmakefile \
install/ops-install install/boss-install install/fs-install \
install/load-descriptors install/dump-descriptors \
......
......@@ -976,6 +976,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
cdrom/groklilo/GNUmakefile \
flash/GNUmakefile \
dhcpd/dhcpd.conf.template dhcpd/GNUmakefile \
dhcpd/dhcpd.conf.subboss.template \
install/GNUmakefile \
install/ops-install install/boss-install install/fs-install \
install/load-descriptors install/dump-descriptors \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment