From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BD3D5138A1A for ; Thu, 8 Jan 2015 12:49:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 969A9E086A; Thu, 8 Jan 2015 12:49:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EA86E085E for ; Thu, 8 Jan 2015 12:49:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0603534071A for ; Thu, 8 Jan 2015 12:49:13 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2264) id 650BBF220; Thu, 8 Jan 2015 12:49:11 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in profiles: ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog X-VCS-Directories: profiles X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150108124911.650BBF220@oystercatcher.gentoo.org> Date: Thu, 8 Jan 2015 12:49:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8d3e1e98-742b-4c04-a9ec-8125b276e27c X-Archives-Hash: a6245e63f050bb640aaae61deef4400f 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 +updates/1Q-2015: + Resolve file collision for sci-libs/Fiona between SLOTs + 08 Jan 2015; Eray Aslan package.mask: Unmask mail-client/squirrelmail-1.4.23_pre - bug #524238 @@ -28,6 +31,7 @@ 05 Jan 2015; Tony Vroon package.mask: Mask Asterisk 13 branch. +>>>>>>> 1.9669 01 Jan 2015; Mikle Kolyada package.mask: Remove obsolete dev-perl masks.