[gentoo-commits] gentoo-x86 commit in profiles: ChangeLog

[Michal Gorny (mgorny)]

mgorny      15/07/26 21:36:03

  Modified:             ChangeLog
  Log:
  Fix plasma5 vs kde4 conflicts. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.

Revision  Changes    Path
1.10208              profiles/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.10208&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.10208&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.10207&r2=1.10208

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v
retrieving revision 1.10207
retrieving revision 1.10208
diff -u -r1.10207 -r1.10208
--- ChangeLog	26 Jul 2015 20:54:56 -0000	1.10207
+++ ChangeLog	26 Jul 2015 21:36:02 -0000	1.10208
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10207 2015/07/26 20:54:56 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10208 2015/07/26 21:36:02 mgorny Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  26 Jul 2015; Michał Górny <mgorny@g.o>
+  targets/desktop/kde/package.use, targets/desktop/plasma/package.use:
+  Fix plasma5 vs kde4 conflicts.
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
+
   26 Jul 2015; Ryan Hill <rhill@g.o> desc/linguas.desc:
   Add a few locales from poedit.