Sun Sep 15 17:33:20 2013 UTC ()
Remove conflict.


(wiz)
diff -r1.3533 -r1.3534 pkgsrc/doc/CHANGES-2013
cvs diff -r1.3533 -r1.3534 pkgsrc/doc/CHANGES-2013 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2013 2013/09/15 17:32:52 1.3533
+++ pkgsrc/doc/CHANGES-2013 2013/09/15 17:33:20 1.3534
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2013,v 1.3533 2013/09/15 17:32:52 wiz Exp $ 1$NetBSD: CHANGES-2013,v 1.3534 2013/09/15 17:33:20 wiz Exp $
2 2
3Changes to the packages collection and infrastructure in 2013: 3Changes to the packages collection and infrastructure in 2013:
4 4
5 Updated textproc/mdoclint to 1.18 [jnemeth 2013-01-01] 5 Updated textproc/mdoclint to 1.18 [jnemeth 2013-01-01]
6 Updated graphics/blender to 2.65a [ryoon 2013-01-02] 6 Updated graphics/blender to 2.65a [ryoon 2013-01-02]
7 Updated graphics/fotoxx to 13.01 [ryoon 2013-01-02] 7 Updated graphics/fotoxx to 13.01 [ryoon 2013-01-02]
8 Updated net/aria2 to 1.16.1 [ryoon 2013-01-02] 8 Updated net/aria2 to 1.16.1 [ryoon 2013-01-02]
9 Updated comms/asterisk to 11.1.1 [jnemeth 2013-01-03] 9 Updated comms/asterisk to 11.1.1 [jnemeth 2013-01-03]
10 Updated comms/asterisk to 10.11.1 [jnemeth 2013-01-03] 10 Updated comms/asterisk to 10.11.1 [jnemeth 2013-01-03]
11 Updated comms/asterisk to 1.8.19.1 [jnemeth 2013-01-03] 11 Updated comms/asterisk to 1.8.19.1 [jnemeth 2013-01-03]
12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2012Q4 branch [agc 2013-01-03] 12 mk/bsd.pkg.mk: freeze ended for pkgsrc-2012Q4 branch [agc 2013-01-03]
13 Updated mail/milter-greylist to 4.4.1 [tron 2013-01-03] 13 Updated mail/milter-greylist to 4.4.1 [tron 2013-01-03]
14 Updated www/py-django-mptt to 0.5.5 [adam 2013-01-03] 14 Updated www/py-django-mptt to 0.5.5 [adam 2013-01-03]
@@ -4968,24 +4968,20 @@ Changes to the packages collection and i @@ -4968,24 +4968,20 @@ Changes to the packages collection and i
4968 Updated textproc/ruby-libxml to 2.7.0 [taca 2013-09-15] 4968 Updated textproc/ruby-libxml to 2.7.0 [taca 2013-09-15]
4969 Updated textproc/ruby-nokogiri to 1.5.10 [taca 2013-09-15] 4969 Updated textproc/ruby-nokogiri to 1.5.10 [taca 2013-09-15]
4970 Added textproc/ruby-redcarpet version 3.0.0 [taca 2013-09-15] 4970 Added textproc/ruby-redcarpet version 3.0.0 [taca 2013-09-15]
4971 Added textproc/ruby-safe_yaml version 0.9.5 [taca 2013-09-15] 4971 Added textproc/ruby-safe_yaml version 0.9.5 [taca 2013-09-15]
4972 Updated textproc/ruby-treetop to 1.4.15 [taca 2013-09-15] 4972 Updated textproc/ruby-treetop to 1.4.15 [taca 2013-09-15]
4973 Updated textproc/ruby-ultraviolet to 1.0.1 [taca 2013-09-15] 4973 Updated textproc/ruby-ultraviolet to 1.0.1 [taca 2013-09-15]
4974 Updated www/camping to 2.1.532 [taca 2013-09-15] 4974 Updated www/camping to 2.1.532 [taca 2013-09-15]
4975 Updated www/heel to 3.1.0 [taca 2013-09-15] 4975 Updated www/heel to 3.1.0 [taca 2013-09-15]
4976 Added www/ruby-cookiejar version 0.3.0 [taca 2013-09-15] 4976 Added www/ruby-cookiejar version 0.3.0 [taca 2013-09-15]
4977 Updated www/ruby-css-parser to 1.3.5 [taca 2013-09-15] 4977 Updated www/ruby-css-parser to 1.3.5 [taca 2013-09-15]
4978 Added www/ruby-http-cookie version 1.0.2 [taca 2013-09-15] 4978 Added www/ruby-http-cookie version 1.0.2 [taca 2013-09-15]
4979 Added misc/ruby-colorator version 0.1 [taca 2013-09-15] 4979 Added misc/ruby-colorator version 0.1 [taca 2013-09-15]
4980 Updated www/ruby-pygments.rb to 0.5.2 [taca 2013-09-15] 4980 Updated www/ruby-pygments.rb to 0.5.2 [taca 2013-09-15]
4981<<<<<<< CHANGES-2013 
4982 Updated devel/meld to 1.8.0 [wiz 2013-09-15] 
4983======= 
4984 Updated www/ruby-jekyll to 1.2.0 [taca 2013-09-15] 4981 Updated www/ruby-jekyll to 1.2.0 [taca 2013-09-15]
4985 Updated www/ruby-jquery-rails to 3.0.4 [taca 2013-09-15] 4982 Updated www/ruby-jquery-rails to 3.0.4 [taca 2013-09-15]
4986 Updated www/ruby-liquid to 2.5.2 [taca 2013-09-15] 4983 Updated www/ruby-liquid to 2.5.2 [taca 2013-09-15]
4987>>>>>>> 1.3529 
4988 Updated devel/meld to 1.8.0 [wiz 2013-09-15] 4984 Updated devel/meld to 1.8.0 [wiz 2013-09-15]
4989 Updated textproc/py-lxml to 3.2.3 [wiz 2013-09-15] 4985 Updated textproc/py-lxml to 3.2.3 [wiz 2013-09-15]
4990 Updated devel/py-setuptools to 1.1.5 [wiz 2013-09-15] 4986 Updated devel/py-setuptools to 1.1.5 [wiz 2013-09-15]
4991 Updated devel/libntlm to 1.4 [wiz 2013-09-15] 4987 Updated devel/libntlm to 1.4 [wiz 2013-09-15]