summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-04-24 21:11:25 +0000
committerjoerg <joerg@pkgsrc.org>2010-04-24 21:11:25 +0000
commit7c8b28f099ca94b4bf49546af6a0c55c977cd111 (patch)
tree8d0ba064df53902768742b21567b01f157b082c6 /devel
parent322f7356128d01780ddb095deb10ed2974b1ee6b (diff)
downloadpkgsrc-7c8b28f099ca94b4bf49546af6a0c55c977cd111.tar.gz
Regen
Diffstat (limited to 'devel')
-rw-r--r--devel/bmake/files/bmake.cat15
1 files changed, 1 insertions, 4 deletions
diff --git a/devel/bmake/files/bmake.cat1 b/devel/bmake/files/bmake.cat1
index 4cac6dd3d39..752aa7e011d 100644
--- a/devel/bmake/files/bmake.cat1
+++ b/devel/bmake/files/bmake.cat1
@@ -1166,7 +1166,4 @@ HHIISSTTOORRYY
bbmmaakkee is derived from NetBSD's make(1). It uses autoconf to facilitate
portability to other platforms.
-NetBSD 5.0 April 14, 2010 NetBSD 5.0
-=======
-NetBSD 5.0_STABLE April 21, 2010 NetBSD 5.0_STABLE
->>>>>>> 1.1.1.5
+NetBSD 5.0 April 21, 2010 NetBSD 5.0