Sat Apr 25 11:36:18 2015 UTC ()
Remove conflict markers.


(wiz)
diff -r1.1920 -r1.1921 pkgsrc/doc/CHANGES-2015
cvs diff -r1.1920 -r1.1921 pkgsrc/doc/CHANGES-2015 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2015 2015/04/25 11:35:46 1.1920
+++ pkgsrc/doc/CHANGES-2015 2015/04/25 11:36:18 1.1921
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2015,v 1.1920 2015/04/25 11:35:46 wiz Exp $ 1$NetBSD: CHANGES-2015,v 1.1921 2015/04/25 11:36:18 wiz 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]
@@ -2866,29 +2866,27 @@ Changes to the packages collection and i @@ -2866,29 +2866,27 @@ Changes to the packages collection and i
2866 Updated devel/p5-Sub-Name to 0.14 [mef 2015-04-25] 2866 Updated devel/p5-Sub-Name to 0.14 [mef 2015-04-25]
2867 Updated devel/p5-Tree-Simple to 1.25 [mef 2015-04-25] 2867 Updated devel/p5-Tree-Simple to 1.25 [mef 2015-04-25]
2868 Updated devel/p5-UNIVERSAL-require to 0.18 [mef 2015-04-25] 2868 Updated devel/p5-UNIVERSAL-require to 0.18 [mef 2015-04-25]
2869 Updated devel/p5-Variable-Magic to 0.57 [mef 2015-04-25] 2869 Updated devel/p5-Variable-Magic to 0.57 [mef 2015-04-25]
2870 Updated devel/p5-Want to 0.25 [mef 2015-04-25] 2870 Updated devel/p5-Want to 0.25 [mef 2015-04-25]
2871 Updated devel/p5-indirect to 0.35 [mef 2015-04-25] 2871 Updated devel/p5-indirect to 0.35 [mef 2015-04-25]
2872 Updated devel/git to 2.3.6 [adam 2015-04-25] 2872 Updated devel/git to 2.3.6 [adam 2015-04-25]
2873 Updated devel/git-base to 2.3.6 [adam 2015-04-25] 2873 Updated devel/git-base to 2.3.6 [adam 2015-04-25]
2874 Updated devel/git-docs to 2.3.6 [adam 2015-04-25] 2874 Updated devel/git-docs to 2.3.6 [adam 2015-04-25]
2875 Updated devel/git-gitk to 2.3.6 [adam 2015-04-25] 2875 Updated devel/git-gitk to 2.3.6 [adam 2015-04-25]
2876 Updated devel/git-svn to 2.3.6 [adam 2015-04-25] 2876 Updated devel/git-svn to 2.3.6 [adam 2015-04-25]
2877 Updated www/gitweb to 2.3.6 [adam 2015-04-25] 2877 Updated www/gitweb to 2.3.6 [adam 2015-04-25]
2878 Updated net/p5-Net to 3.06 [mef 2015-04-25] 2878 Updated net/p5-Net to 3.06 [mef 2015-04-25]
2879<<<<<<< CHANGES-2015 
2880 Renamed lang/gcc to lang/gcc2 [wiz 2015-04-25] 2879 Renamed lang/gcc to lang/gcc2 [wiz 2015-04-25]
2881======= 
2882 Added devel/py-pyobjc version 3.0.4 [adam 2015-04-25] 2880 Added devel/py-pyobjc version 3.0.4 [adam 2015-04-25]
2883 Added devel/py-pyobjc-core version 3.0.4 [adam 2015-04-25] 2881 Added devel/py-pyobjc-core version 3.0.4 [adam 2015-04-25]
2884 Added devel/py-pyobjc-framework-Accounts version 3.0.4 [adam 2015-04-25] 2882 Added devel/py-pyobjc-framework-Accounts version 3.0.4 [adam 2015-04-25]
2885 Added devel/py-pyobjc-framework-AddressBook version 3.0.4 [adam 2015-04-25] 2883 Added devel/py-pyobjc-framework-AddressBook version 3.0.4 [adam 2015-04-25]
2886 Added devel/py-pyobjc-framework-AppleScriptKit version 3.0.4 [adam 2015-04-25] 2884 Added devel/py-pyobjc-framework-AppleScriptKit version 3.0.4 [adam 2015-04-25]
2887 Added devel/py-pyobjc-framework-AppleScriptObjC version 3.0.4 [adam 2015-04-25] 2885 Added devel/py-pyobjc-framework-AppleScriptObjC version 3.0.4 [adam 2015-04-25]
2888 Added devel/py-pyobjc-framework-Automator version 3.0.4 [adam 2015-04-25] 2886 Added devel/py-pyobjc-framework-Automator version 3.0.4 [adam 2015-04-25]
2889 Added devel/py-pyobjc-framework-CalendarStore version 3.0.4 [adam 2015-04-25] 2887 Added devel/py-pyobjc-framework-CalendarStore version 3.0.4 [adam 2015-04-25]
2890 Added devel/py-pyobjc-framework-CFNetwork version 3.0.4 [adam 2015-04-25] 2888 Added devel/py-pyobjc-framework-CFNetwork version 3.0.4 [adam 2015-04-25]
2891 Added devel/py-pyobjc-framework-Cocoa version 3.0.4 [adam 2015-04-25] 2889 Added devel/py-pyobjc-framework-Cocoa version 3.0.4 [adam 2015-04-25]
2892 Added devel/py-pyobjc-framework-Collaboration version 3.0.4 [adam 2015-04-25] 2890 Added devel/py-pyobjc-framework-Collaboration version 3.0.4 [adam 2015-04-25]
2893 Added devel/py-pyobjc-framework-CoreData version 3.0.4 [adam 2015-04-25] 2891 Added devel/py-pyobjc-framework-CoreData version 3.0.4 [adam 2015-04-25]
2894 Added devel/py-pyobjc-framework-CoreLocation version 3.0.4 [adam 2015-04-25] 2892 Added devel/py-pyobjc-framework-CoreLocation version 3.0.4 [adam 2015-04-25]
@@ -2908,15 +2906,14 @@ Changes to the packages collection and i @@ -2908,15 +2906,14 @@ Changes to the packages collection and i
2908 Added devel/py-pyobjc-framework-PreferencePanes version 3.0.4 [adam 2015-04-25] 2906 Added devel/py-pyobjc-framework-PreferencePanes version 3.0.4 [adam 2015-04-25]
2909 Added devel/py-pyobjc-framework-PubSub version 3.0.4 [adam 2015-04-25] 2907 Added devel/py-pyobjc-framework-PubSub version 3.0.4 [adam 2015-04-25]
2910 Added devel/py-pyobjc-framework-QTKit version 3.0.4 [adam 2015-04-25] 2908 Added devel/py-pyobjc-framework-QTKit version 3.0.4 [adam 2015-04-25]
2911 Added devel/py-pyobjc-framework-Quartz version 3.0.4 [adam 2015-04-25] 2909 Added devel/py-pyobjc-framework-Quartz version 3.0.4 [adam 2015-04-25]
2912 Added devel/py-pyobjc-framework-ScreenSaver version 3.0.4 [adam 2015-04-25] 2910 Added devel/py-pyobjc-framework-ScreenSaver version 3.0.4 [adam 2015-04-25]
2913 Added devel/py-pyobjc-framework-ScriptingBridge version 3.0.4 [adam 2015-04-25] 2911 Added devel/py-pyobjc-framework-ScriptingBridge version 3.0.4 [adam 2015-04-25]
2914 Added devel/py-pyobjc-framework-SearchKit version 3.0.4 [adam 2015-04-25] 2912 Added devel/py-pyobjc-framework-SearchKit version 3.0.4 [adam 2015-04-25]
2915 Added devel/py-pyobjc-framework-ServiceManagement version 3.0.4 [adam 2015-04-25] 2913 Added devel/py-pyobjc-framework-ServiceManagement version 3.0.4 [adam 2015-04-25]
2916 Added devel/py-pyobjc-framework-Social version 3.0.4 [adam 2015-04-25] 2914 Added devel/py-pyobjc-framework-Social version 3.0.4 [adam 2015-04-25]
2917 Added devel/py-pyobjc-framework-StoreKit version 3.0.4 [adam 2015-04-25] 2915 Added devel/py-pyobjc-framework-StoreKit version 3.0.4 [adam 2015-04-25]
2918 Added devel/py-pyobjc-framework-SyncServices version 3.0.4 [adam 2015-04-25] 2916 Added devel/py-pyobjc-framework-SyncServices version 3.0.4 [adam 2015-04-25]
2919 Added devel/py-pyobjc-framework-SystemConfiguration version 3.0.4 [adam 2015-04-25] 2917 Added devel/py-pyobjc-framework-SystemConfiguration version 3.0.4 [adam 2015-04-25]
2920 Added devel/py-pyobjc-framework-WebKit version 3.0.4 [adam 2015-04-25] 2918 Added devel/py-pyobjc-framework-WebKit version 3.0.4 [adam 2015-04-25]
2921>>>>>>> 1.1919 
2922 Updated misc/calibre to 2.26.0 [wiz 2015-04-25] 2919 Updated misc/calibre to 2.26.0 [wiz 2015-04-25]