diff options
| author | mef <mef@pkgsrc.org> | 2015-11-23 10:36:24 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2015-11-23 10:36:24 +0000 |
| commit | 7c24292e3d0b67f9bbd7f197e208a8807807d80d (patch) | |
| tree | 272a75eed2b14784687b702c1c94a7ae897668c8 | |
| parent | 96b9270b0834a9df6fad87db5345c9697b1c816e (diff) | |
| download | pkgsrc-7c24292e3d0b67f9bbd7f197e208a8807807d80d.tar.gz | |
Sorry for conflict, fix it.
| -rw-r--r-- | doc/CHANGES-2015 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/CHANGES-2015 b/doc/CHANGES-2015 index 53183146d6f..b4eede565f1 100644 --- a/doc/CHANGES-2015 +++ b/doc/CHANGES-2015 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2015,v 1.4709 2015/11/23 10:35:10 mef Exp $ +$NetBSD: CHANGES-2015,v 1.4710 2015/11/23 10:36:24 mef Exp $ Changes to the packages collection and infrastructure in 2015: @@ -7923,10 +7923,7 @@ Changes to the packages collection and infrastructure in 2015: Updated www/ruby-pygments.rb to 0.6.3nb1 [taca 2015-11-23] Updated security/ruby-shadow to 2.5.0 [taca 2015-11-23] Updated textproc/ruby-nokogiri to 1.6.6.4 [taca 2015-11-23] -<<<<<<< CHANGES-2015 - Updated www/p5-Apache2-AuthCookie to 3.23 [mef 2015-11-23] -======= Updated audio/libshout to 2.4.1 [wiz 2015-11-23] Updated print/poppler to 0.38.0 [wiz 2015-11-23] ->>>>>>> 1.4708 + Updated www/p5-Apache2-AuthCookie to 3.23 [mef 2015-11-23] Updated www/p5-CGI-Compile to 0.20 [mef 2015-11-23] |