summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-06-29 18:36:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-06-29 18:36:07 +0000
commit6fd762938c0094e6fd1de05c8b09ed119b54f0a5 (patch)
tree56e7c4a6d0cbff93c3e73aeba1ad27c9b53ccd5f
parent525d3d3091ac3957276539f8161f73a44e2219f4 (diff)
sync
-rw-r--r--distrib/sets/lists/base/mi1
-rw-r--r--distrib/sets/lists/man/mi1
2 files changed, 2 insertions, 0 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 6343af60dc5..9eae764b6c2 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1840,6 +1840,7 @@
./usr/sbin/pkg_create
./usr/sbin/pkg_delete
./usr/sbin/pkg_info
+./usr/sbin/pkg_merge
./usr/sbin/pkg_mklocatedb
./usr/sbin/popa3d
./usr/sbin/portmap
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 7534a39879f..9c4bf8f875c 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -500,6 +500,7 @@
./usr/share/man/cat1/pkg_create.0
./usr/share/man/cat1/pkg_delete.0
./usr/share/man/cat1/pkg_info.0
+./usr/share/man/cat1/pkg_merge.0
./usr/share/man/cat1/pkg_mklocatedb.0
./usr/share/man/cat1/pkill.0
./usr/share/man/cat1/pl2pm.0