Sun Jul 26 21:28:46 2009 UTC ()
Resolved conflicts.


(rillig)
diff -r1.2849 -r1.2850 pkgsrc/doc/CHANGES-2009
cvs diff -r1.2849 -r1.2850 pkgsrc/doc/CHANGES-2009 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2009 2009/07/26 21:28:01 1.2849
+++ pkgsrc/doc/CHANGES-2009 2009/07/26 21:28:45 1.2850
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2009,v 1.2849 2009/07/26 21:28:01 rillig Exp $ 1$NetBSD: CHANGES-2009,v 1.2850 2009/07/26 21:28:45 rillig Exp $
2 2
3Changes to the packages collection and infrastructure in 2009: 3Changes to the packages collection and infrastructure in 2009:
4 4
5 Updated databases/py-postgresql to 4.0 [darcy 2009-01-01] 5 Updated databases/py-postgresql to 4.0 [darcy 2009-01-01]
6 Updated security/amavisd-new to 2.6.2 [obache 2009-01-01] 6 Updated security/amavisd-new to 2.6.2 [obache 2009-01-01]
7 Updated devel/cpuflags to 1.31 [abs 2009-01-02] 7 Updated devel/cpuflags to 1.31 [abs 2009-01-02]
8 Updated databases/rrdtool to 1.3.5 [martti 2009-01-02] 8 Updated databases/rrdtool to 1.3.5 [martti 2009-01-02]
9 Updated databases/rrdtool12 to 1.2.29 [martti 2009-01-02] 9 Updated databases/rrdtool12 to 1.2.29 [martti 2009-01-02]
10 Updated textproc/p5-Text-WrapI18N to 0.06nb2 [he 2009-01-02] 10 Updated textproc/p5-Text-WrapI18N to 0.06nb2 [he 2009-01-02]
11 Updated devel/p5-Rose-Object to 0.85.4 [he 2009-01-02] 11 Updated devel/p5-Rose-Object to 0.85.4 [he 2009-01-02]
12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2008Q4 branch [agc 2009-01-03] 12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2008Q4 branch [agc 2009-01-03]
13 Updated archivers/pbzip2 to 1.0.4 [wiz 2009-01-03] 13 Updated archivers/pbzip2 to 1.0.4 [wiz 2009-01-03]
14 Added emulators/gambatte version 0.4.0 [wiz 2009-01-03] 14 Added emulators/gambatte version 0.4.0 [wiz 2009-01-03]
@@ -3766,24 +3766,15 @@ Changes to the packages collection and i @@ -3766,24 +3766,15 @@ Changes to the packages collection and i
3766 Updated audio/libmp3splt to 0.5.6 [schmonz 2009-07-25] 3766 Updated audio/libmp3splt to 0.5.6 [schmonz 2009-07-25]
3767 Updated audio/mp3splt to 2.2.5 [schmonz 2009-07-25] 3767 Updated audio/mp3splt to 2.2.5 [schmonz 2009-07-25]
3768 Updated www/websvn to 2.2.1 [schmonz 2009-07-25] 3768 Updated www/websvn to 2.2.1 [schmonz 2009-07-25]
3769 Added devel/p5-Test-LeakTrace version 0.10 [seb 2009-07-25] 3769 Added devel/p5-Test-LeakTrace version 0.10 [seb 2009-07-25]
3770 Updated emulators/sdlmame to 0.133 [wiz 2009-07-25] 3770 Updated emulators/sdlmame to 0.133 [wiz 2009-07-25]
3771 Updated www/typolight27-translations to 20090725 [taca 2009-07-26] 3771 Updated www/typolight27-translations to 20090725 [taca 2009-07-26]
3772 Updated devel/p5-Class-MOP to 0.90 [seb 2009-07-26] 3772 Updated devel/p5-Class-MOP to 0.90 [seb 2009-07-26]
3773 Updated devel/p5-Moose to 0.88 [seb 2009-07-26] 3773 Updated devel/p5-Moose to 0.88 [seb 2009-07-26]
3774 Updated net/bind96 to 9.6.1 [obache 2009-07-26] 3774 Updated net/bind96 to 9.6.1 [obache 2009-07-26]
3775 Updated print/web2c to 7.5.7nb5 [minskim 2009-07-26] 3775 Updated print/web2c to 7.5.7nb5 [minskim 2009-07-26]
3776 Updated archivers/zziplib to 0.13.56 [minskim 2009-07-26] 3776 Updated archivers/zziplib to 0.13.56 [minskim 2009-07-26]
3777 Updated www/php-eaccelerator to 0.9.5.3 [jdolecek 2009-07-26] 3777 Updated www/php-eaccelerator to 0.9.5.3 [jdolecek 2009-07-26]
3778 Added lang/LuaJIT version 1.1.5 [rillig 2009-07-26] 3778 Added lang/LuaJIT version 1.1.5 [rillig 2009-07-26]
3779<<<<<<< CHANGES-2009 
3780 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3781 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3782 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3783 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3784 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3785 Added audio/xmms2 version 0.2rc10nb3 [rillig 2009-07-26] 
3786======= 
3787 Updated archivers/php-zip to 5.2.10.1.0nb1 [minskim 2009-07-26] 3779 Updated archivers/php-zip to 5.2.10.1.0nb1 [minskim 2009-07-26]
3788>>>>>>> 1.2848 
3789 Added shells/dash version 0.5.5.1 [rillig 2009-07-26] 3780 Added shells/dash version 0.5.5.1 [rillig 2009-07-26]