Updated devel/meld to 1.8.0

TritonDataCenter · Sep 15, 2013 · c76da22 · c76da22
1 parent 5de9afe
commit c76da22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2013,v 1.3529 2013/09/15 17:25:48 taca Exp $
+$NetBSD: CHANGES-2013,v 1.3530 2013/09/15 17:27:44 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2013:
 
@@ -4978,6 +4978,11 @@ Changes to the packages collection and infrastructure in 2013:
 	Added www/ruby-http-cookie version 1.0.2 [taca 2013-09-15]
 	Added misc/ruby-colorator version 0.1 [taca 2013-09-15]
 	Updated www/ruby-pygments.rb to 0.5.2 [taca 2013-09-15]
+<<<<<<< CHANGES-2013
+	Updated devel/meld to 1.8.0 [wiz 2013-09-15]
+=======
 	Updated www/ruby-jekyll to 1.2.0 [taca 2013-09-15]
 	Updated www/ruby-jquery-rails to 3.0.4 [taca 2013-09-15]
 	Updated www/ruby-liquid to 2.5.2 [taca 2013-09-15]
+>>>>>>> 1.3529
+	Updated devel/meld to 1.8.0 [wiz 2013-09-15]
diff --git a/doc/TODO b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.12554 2013/09/15 17:12:12 wiz Exp $
+$NetBSD: TODO,v 1.12555 2013/09/15 17:27:44 wiz Exp $
 
 Suggested new packages
 ======================
@@ -765,7 +765,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o mc-4.8.9
 	o mcsim-5.5.0
 	o mdocml-1.12.1
-	o meld-1.8.0
 	o mergeant-0.67
 	o mesure-0.7.2
 	o metis-5.1.0