summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-15 11:00:02 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-15 11:00:02 -0600
commiteba252eca59c3d110e90c97d114bacceca343426 (patch)
treec771345d885f449648b2e252bcc4c8fdd6d2d30c /Makefile
parentbf8513ae631484a0c292ad085ea7ede9859f8e0f (diff)
parent453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 (diff)
downloaddevtools-eba252eca59c3d110e90c97d114bacceca343426.tar.xz
Merge commit '4535'
Conflicts: makechrootpkg.in mkarchroot.in
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3bb6464..d73682a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ BINPROGS = \
crossrepomove
SBINPROGS = \
+ arch-nspawn \
mkarchroot \
makechrootpkg