diff options
| author | Steve Price <steve@FreeBSD.org> | 1998-09-17 22:38:47 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1998-09-17 22:38:47 +0000 |
| commit | 26ebf6897cf23b58a4e6cb1bba204d75a6825c02 (patch) | |
| tree | 75c34b939ac45039dfcbc404123023f9586b324d /sysutils/Makefile | |
| parent | Make this build in an ELF world. (diff) | |
Activate mergemaster.
Notes
Notes:
svn path=/head/; revision=13210
Diffstat (limited to 'sysutils/Makefile')
| -rw-r--r-- | sysutils/Makefile | 3 |
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 |