jlec 15/01/08 12:49:11 Modified: ChangeLog Log: Resolve file collision for sci-libs/Fiona between SLOTs
Revision Changes Path 1.9670 profiles/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.9670&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.9670&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.9669&r2=1.9670 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v retrieving revision 1.9669 retrieving revision 1.9670 diff -u -r1.9669 -r1.9670 --- ChangeLog 8 Jan 2015 12:19:45 -0000 1.9669 +++ ChangeLog 8 Jan 2015 12:49:11 -0000 1.9670 @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9669 2015/01/08 12:19:45 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9670 2015/01/08 12:49:11 jlec 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! + 08 Jan 2015; Justin Lecher <[email protected]> +updates/1Q-2015: + Resolve file collision for sci-libs/Fiona between SLOTs + 08 Jan 2015; Eray Aslan <[email protected]> package.mask: Unmask mail-client/squirrelmail-1.4.23_pre - bug #524238 @@ -28,6 +31,7 @@ 05 Jan 2015; Tony Vroon <[email protected]> package.mask: Mask Asterisk 13 branch. +>>>>>>> 1.9669 01 Jan 2015; Mikle Kolyada <[email protected]> package.mask: Remove obsolete dev-perl masks.
