aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1998-09-18 06:38:47 +0800
committersteve <steve@FreeBSD.org>1998-09-18 06:38:47 +0800
commit186395322f107a348e6f98aae1f4a1e0440c8da8 (patch)
treee1a7202f848f5b93cfbebe7d90b7962ee8b7edd5 /sysutils
parent04a9e032559f6dd0040bbd35fa62a72fcd778172 (diff)
downloadfreebsd-ports-gnome-186395322f107a348e6f98aae1f4a1e0440c8da8.tar.gz
freebsd-ports-gnome-186395322f107a348e6f98aae1f4a1e0440c8da8.tar.zst
freebsd-ports-gnome-186395322f107a348e6f98aae1f4a1e0440c8da8.zip
Activate mergemaster.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6c1a4c56e922..de32b6ced564 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 1998/08/03 06:28:56 nectar Exp $
+# $Id: Makefile,v 1.42 1998/08/10 00:38:09 steve Exp $
#
SUBDIR += LPRng
@@ -17,6 +17,7 @@
SUBDIR += lsof
SUBDIR += manck
SUBDIR += mei
+ SUBDIR += mergemaster
SUBDIR += mkhybrid11
SUBDIR += mkhybrid12
SUBDIR += mkisofs