Mon Nov 23 10:36:24 2015 UTC ()
Sorry for conflict, fix it.


(mef)
diff -r1.4709 -r1.4710 pkgsrc/doc/CHANGES-2015
cvs diff -r1.4709 -r1.4710 pkgsrc/doc/CHANGES-2015 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2015 2015/11/23 10:35:10 1.4709
+++ pkgsrc/doc/CHANGES-2015 2015/11/23 10:36:24 1.4710
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2015,v 1.4709 2015/11/23 10:35:10 mef Exp $ 1$NetBSD: CHANGES-2015,v 1.4710 2015/11/23 10:36:24 mef Exp $
2 2
3Changes to the packages collection and infrastructure in 2015: 3Changes to the packages collection and infrastructure in 2015:
4 4
5 Updated www/p5-Catalyst-Engine-JobQueue-POE to 0.0.4 [mef 2015-01-01] 5 Updated www/p5-Catalyst-Engine-JobQueue-POE to 0.0.4 [mef 2015-01-01]
6 Updated lang/gcc46 to 4.6.4nb3 [ryoon 2015-01-01] 6 Updated lang/gcc46 to 4.6.4nb3 [ryoon 2015-01-01]
7 Added lang/gcc46-libs version 4.6.4nb4 [ryoon 2015-01-01] 7 Added lang/gcc46-libs version 4.6.4nb4 [ryoon 2015-01-01]
8 Updated www/p5-Catalyst-Plugin-Authorization-ACL to 0.16 [mef 2015-01-01] 8 Updated www/p5-Catalyst-Plugin-Authorization-ACL to 0.16 [mef 2015-01-01]
9 Updated www/p5-Catalyst-Plugin-ConfigLoader to 0.34 [mef 2015-01-01] 9 Updated www/p5-Catalyst-Plugin-ConfigLoader to 0.34 [mef 2015-01-01]
10 Updated www/p5-Catalyst-Plugin-Static-Simple to 0.33 [mef 2015-01-01] 10 Updated www/p5-Catalyst-Plugin-Static-Simple to 0.33 [mef 2015-01-01]
11 Updated www/p5-Catalyst-Plugin-StatusMessage to 1.002000 [mef 2015-01-01] 11 Updated www/p5-Catalyst-Plugin-StatusMessage to 1.002000 [mef 2015-01-01]
12 Updated www/p5-Catalyst-View-Mason to 0.19 [mef 2015-01-01] 12 Updated www/p5-Catalyst-View-Mason to 0.19 [mef 2015-01-01]
13 Updated www/p5-Catalyst-View-TT to 0.42 [mef 2015-01-01] 13 Updated www/p5-Catalyst-View-TT to 0.42 [mef 2015-01-01]
14 Updated www/p5-CatalystX-CRUD-Controller-REST to 0.004 [mef 2015-01-01] 14 Updated www/p5-CatalystX-CRUD-Controller-REST to 0.004 [mef 2015-01-01]
@@ -7913,20 +7913,17 @@ Changes to the packages collection and i @@ -7913,20 +7913,17 @@ Changes to the packages collection and i
7913 Updated textproc/libxml2 to 2.9.3 [wiz 2015-11-22] 7913 Updated textproc/libxml2 to 2.9.3 [wiz 2015-11-22]
7914 Updated mail/notmuch to 0.21 [wiz 2015-11-22] 7914 Updated mail/notmuch to 0.21 [wiz 2015-11-22]
7915 Updated textproc/py-libxml2 to 2.9.3 [wiz 2015-11-23] 7915 Updated textproc/py-libxml2 to 2.9.3 [wiz 2015-11-23]
7916 Updated devel/py-test to 2.8.3 [wiz 2015-11-23] 7916 Updated devel/py-test to 2.8.3 [wiz 2015-11-23]
7917 Updated textproc/xmlto to 0.0.28 [wiz 2015-11-23] 7917 Updated textproc/xmlto to 0.0.28 [wiz 2015-11-23]
7918 Updated security/py-cryptography to 1.1.1 [wiz 2015-11-23] 7918 Updated security/py-cryptography to 1.1.1 [wiz 2015-11-23]
7919 Updated devel/py-cffi to 1.3.1 [wiz 2015-11-23] 7919 Updated devel/py-cffi to 1.3.1 [wiz 2015-11-23]
7920 Updated devel/py-tortoisehg to 3.6.1 [wiz 2015-11-23] 7920 Updated devel/py-tortoisehg to 3.6.1 [wiz 2015-11-23]
7921 Updated devel/kyua to 0.12 [jmmv 2015-11-23] 7921 Updated devel/kyua to 0.12 [jmmv 2015-11-23]
7922 Updated devel/ruby-parslet to 1.7.1 [taca 2015-11-23] 7922 Updated devel/ruby-parslet to 1.7.1 [taca 2015-11-23]
7923 Updated www/ruby-pygments.rb to 0.6.3nb1 [taca 2015-11-23] 7923 Updated www/ruby-pygments.rb to 0.6.3nb1 [taca 2015-11-23]
7924 Updated security/ruby-shadow to 2.5.0 [taca 2015-11-23] 7924 Updated security/ruby-shadow to 2.5.0 [taca 2015-11-23]
7925 Updated textproc/ruby-nokogiri to 1.6.6.4 [taca 2015-11-23] 7925 Updated textproc/ruby-nokogiri to 1.6.6.4 [taca 2015-11-23]
7926<<<<<<< CHANGES-2015 
7927 Updated www/p5-Apache2-AuthCookie to 3.23 [mef 2015-11-23] 
7928======= 
7929 Updated audio/libshout to 2.4.1 [wiz 2015-11-23] 7926 Updated audio/libshout to 2.4.1 [wiz 2015-11-23]
7930 Updated print/poppler to 0.38.0 [wiz 2015-11-23] 7927 Updated print/poppler to 0.38.0 [wiz 2015-11-23]
7931>>>>>>> 1.4708 7928 Updated www/p5-Apache2-AuthCookie to 3.23 [mef 2015-11-23]
7932 Updated www/p5-CGI-Compile to 0.20 [mef 2015-11-23] 7929 Updated www/p5-CGI-Compile to 0.20 [mef 2015-11-23]