[pkgsrc/trunk]: pkgsrc/doc Merge last changes.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56df5928ff5e
branches:  trunk
changeset: 568553:56df5928ff5e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Dec 15 13:36:59 2009 +0000

description:
Merge last changes.

diffstat:

 doc/CHANGES-2009 |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (19 lines):

diff -r 6f5aadf53d4e -r 56df5928ff5e doc/CHANGES-2009
--- a/doc/CHANGES-2009  Tue Dec 15 13:36:33 2009 +0000
+++ b/doc/CHANGES-2009  Tue Dec 15 13:36:59 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.4613 2009/12/15 13:36:33 wiz Exp $
+$NetBSD: CHANGES-2009,v 1.4614 2009/12/15 13:36:59 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -6196,9 +6196,6 @@
        Updated devel/p5-PAR-Dist to 0.47 [wiz 2009-12-15]
        Updated devel/p5-Params-Validate to 0.94 [wiz 2009-12-15]
        Updated textproc/p5-Pod-Simple to 3.11 [wiz 2009-12-15]
-<<<<<<< CHANGES-2009
        Updated time/p5-TimeDate to 1.20 [wiz 2009-12-15]
-=======
        Updated lang/erlang to 13.2.3nb2 [asau 2009-12-15]
->>>>>>> 1.4612
        Updated www/p5-URI to 1.51 [wiz 2009-12-15]