diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:36:03 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-07-26 21:36:03 +0000 |
| commit | de6f6de4bce5a4deebace1b80670509b5b3fef41 (patch) | |
| tree | da461c1c631b69dd8a3809b62a3bfccb1e0a858b /profiles/ChangeLog | |
| parent | Fix conflict with kf5-based kdepim. https://github.com/gentoo/gentoo-portage-... (diff) | |
| download | historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.tar.gz historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.tar.bz2 historical-de6f6de4bce5a4deebace1b80670509b5b3fef41.zip | |
Fix plasma5 vs kde4 conflicts. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/183 by a17r.
Diffstat (limited to 'profiles/ChangeLog')
| -rw-r--r-- | profiles/ChangeLog | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 5f4372d0b64c..bc8c3a4a1c5c 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -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@gentoo.org> + 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@gentoo.org> desc/linguas.desc: Add a few locales from poedit. |