CVS commit: pkgsrc/doc

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Fri Jun 23 17:24:33 UTC 2017

Modified Files:
        pkgsrc/doc: CHANGES-2017

Log Message:
Updated sysutils/mate-notification-daemon to 1.18.0


To generate a diff of this commit:
cvs rdiff -u -r1.2596 -r1.2597 pkgsrc/doc/CHANGES-2017

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2017
diff -u pkgsrc/doc/CHANGES-2017:1.2596 pkgsrc/doc/CHANGES-2017:1.2597
--- pkgsrc/doc/CHANGES-2017:1.2596      Fri Jun 23 17:22:48 2017
+++ pkgsrc/doc/CHANGES-2017     Fri Jun 23 17:24:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.2596 2017/06/23 17:22:48 youri Exp $
+$NetBSD: CHANGES-2017,v 1.2597 2017/06/23 17:24:33 youri Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -3583,11 +3583,8 @@ Changes to the packages collection and i
        Updated graphics/mate-icon-theme to 1.18.2 [youri 2017-06-23]
        Updated graphics/mate-icon-theme-faenza to 1.18.1 [youri 2017-06-23]
        Updated x11/mate-indicator-applet to 1.18.0 [youri 2017-06-23]
-<<<<<<< CHANGES-2017
-       Updated multimedia/mate-media to 1.18.1 [youri 2017-06-23]
-=======
        Updated net/powerdns to 4.0.4 [fhajny 2017-06-23]
->>>>>>> 1.2593
        Updated multimedia/mate-media to 1.18.1 [youri 2017-06-23]
        Updated x11/mate-menus to 1.18.0 [youri 2017-06-23]
        Updated wm/mate-netbook to 1.18.1 [youri 2017-06-23]
+       Updated sysutils/mate-notification-daemon to 1.18.0 [youri 2017-06-23]