Sun Sep 5 01:23:54 2010 UTC ()
Fix botched merge.


(tron)
diff -r1.3133 -r1.3134 pkgsrc/doc/CHANGES-2010
cvs diff -r1.3133 -r1.3134 pkgsrc/doc/CHANGES-2010 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2010 2010/09/05 01:23:00 1.3133
+++ pkgsrc/doc/CHANGES-2010 2010/09/05 01:23:54 1.3134
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2010,v 1.3133 2010/09/05 01:23:00 tron Exp $ 1$NetBSD: CHANGES-2010,v 1.3134 2010/09/05 01:23:54 tron Exp $
2 2
3Changes to the packages collection and infrastructure in 2010: 3Changes to the packages collection and infrastructure in 2010:
4 4
5 Updated textproc/mdoclint to 1.4 [wiz 2010-01-01] 5 Updated textproc/mdoclint to 1.4 [wiz 2010-01-01]
6 Updated net/ntop to 3.3.10nb1 [tron 2010-01-01] 6 Updated net/ntop to 3.3.10nb1 [tron 2010-01-01]
7 Updated net/libtorrent to 0.12.6 [snj 2010-01-01] 7 Updated net/libtorrent to 0.12.6 [snj 2010-01-01]
8 Updated net/rtorrent to 0.8.6 [snj 2010-01-01] 8 Updated net/rtorrent to 0.8.6 [snj 2010-01-01]
9 Updated misc/py-anita to 1.9 [gson 2010-01-02] 9 Updated misc/py-anita to 1.9 [gson 2010-01-02]
10 Updated net/rsync to 3.0.7 [tron 2010-01-02] 10 Updated net/rsync to 3.0.7 [tron 2010-01-02]
11 Updated www/ikiwiki to 3.20100102.3 [schmonz 2010-01-03] 11 Updated www/ikiwiki to 3.20100102.3 [schmonz 2010-01-03]
12 Updated www/trac to 0.11.6 [gdt 2010-01-03] 12 Updated www/trac to 0.11.6 [gdt 2010-01-03]
13 Removed www/firefox-bin-nightly [joerg 2010-01-04] 13 Removed www/firefox-bin-nightly [joerg 2010-01-04]
14 Removed mail/thunderbird-bin-nightly [joerg 2010-01-04] 14 Removed mail/thunderbird-bin-nightly [joerg 2010-01-04]
@@ -4071,19 +4071,15 @@ Changes to the packages collection and i @@ -4071,19 +4071,15 @@ Changes to the packages collection and i
4071 Updated lang/python26 to 2.6.6 [obache 2010-09-04] 4071 Updated lang/python26 to 2.6.6 [obache 2010-09-04]
4072 Added fonts/mothanna-ttf version 0.02 [wiz 2010-09-04] 4072 Added fonts/mothanna-ttf version 0.02 [wiz 2010-09-04]
4073 Added devel/p5-SVN-Dump version 0.04 [sno 2010-09-04] 4073 Added devel/p5-SVN-Dump version 0.04 [sno 2010-09-04]
4074 Added devel/p5-PerlIO-via-Bzip2 version 0.02 [sno 2010-09-04] 4074 Added devel/p5-PerlIO-via-Bzip2 version 0.02 [sno 2010-09-04]
4075 Added devel/p5-PerlIO-gzip version 0.18 [sno 2010-09-04] 4075 Added devel/p5-PerlIO-gzip version 0.18 [sno 2010-09-04]
4076 Updated games/gbrainy to 1.51 [wiz 2010-09-04] 4076 Updated games/gbrainy to 1.51 [wiz 2010-09-04]
4077 Updated devel/p5-App-CLI to 0.08nb2 [sno 2010-09-04] 4077 Updated devel/p5-App-CLI to 0.08nb2 [sno 2010-09-04]
4078 Updated www/p5-CGI-Kwiki to 0.18nb5 [sno 2010-09-04] 4078 Updated www/p5-CGI-Kwiki to 0.18nb5 [sno 2010-09-04]
4079 Updated www/p5-Catalyst-Plugin-I18N to 0.09nb3 [sno 2010-09-04] 4079 Updated www/p5-Catalyst-Plugin-I18N to 0.09nb3 [sno 2010-09-04]
4080 Updated devel/svk to 2.2.3 [sno 2010-09-04] 4080 Updated devel/svk to 2.2.3 [sno 2010-09-04]
4081 Updated www/p5-Handel to 1.00011nb3 [sno 2010-09-04] 4081 Updated www/p5-Handel to 1.00011nb3 [sno 2010-09-04]
4082 Updated www/p5-SVN-Web to 0.53nb5 [sno 2010-09-04] 4082 Updated www/p5-SVN-Web to 0.53nb5 [sno 2010-09-04]
4083 Updated devel/py-setuptools to 0.6c11nb1 [tron 2010-09-04] 4083 Updated devel/py-setuptools to 0.6c11nb1 [tron 2010-09-04]
4084<<<<<<< CHANGES-2010 
4085======= 
4086 Updated pkgtools/rpm2pkg to 3.1.1 [tron 2010-09-05] 
4087 Updated textproc/p5-Search-Xapian to 1.0.21.0 [schmonz 2010-09-05] 4084 Updated textproc/p5-Search-Xapian to 1.0.21.0 [schmonz 2010-09-05]
4088>>>>>>> 1.3132 
4089 Updated pkgtools/rpm2pkg to 3.1.2 [tron 2010-09-05] 4085 Updated pkgtools/rpm2pkg to 3.1.2 [tron 2010-09-05]