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 57B9458973 for ; Mon, 8 Feb 2016 13:16:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E57921C03B; Mon, 8 Feb 2016 13:16:19 +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 A2A0121C011 for ; Mon, 8 Feb 2016 13:16:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48FC6340691 for ; Mon, 8 Feb 2016 13:16:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7D4A8F4 for ; Mon, 8 Feb 2016 13:16:15 +0000 (UTC) From: "Marius Brehler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marius Brehler" Message-ID: <1454687925.cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3.marbre@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipy-data/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/nipy-data/ChangeLog X-VCS-Directories: sci-libs/nipy-data/ X-VCS-Committer: marbre X-VCS-Committer-Name: Marius Brehler X-VCS-Revision: cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3 X-VCS-Branch: master Date: Mon, 8 Feb 2016 13:16:15 +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: 74f4415f-02aa-475a-b037-0f233bc8460e X-Archives-Hash: a7576a26e4cc0b6ec5ed91e0b303f7d4 commit: cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3 Author: Horea Christian mail ru> AuthorDate: Fri Feb 5 15:58:45 2016 +0000 Commit: Marius Brehler linux sungazer de> CommitDate: Fri Feb 5 15:58:45 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=cc12ab13 sci-libs/nipy-data: removed changelog clutter Package-Manager: portage-2.2.27 sci-libs/nipy-data/ChangeLog | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/sci-libs/nipy-data/ChangeLog b/sci-libs/nipy-data/ChangeLog deleted file mode 100644 index f56e44b..0000000 --- a/sci-libs/nipy-data/ChangeLog +++ /dev/null @@ -1,42 +0,0 @@ -# ChangeLog for sci-libs/nipy-data -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Id$ - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - 19 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed unused eclasses, updated description - - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: no stable packages in the overlay - - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed emtpy deps - - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: marked package as stable - -======= ->>>>>>> 6e709b8... sci-libs/nipy-data: new package -======= -======= - 19 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed unused eclasses, updated description - ->>>>>>> 841343a... sci-libs/nipy-data: removed unused eclasses, updated description - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: no stable packages in the overlay - - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed emtpy deps - - 17 Dec 2015; Horea Christian nipy-data-0.2.ebuild: - sci-libs/nipy-data: marked package as stable - ->>>>>>> f7adcb4... sci-libs/nipy-data: marked package as stable -*nipy-data-0.2 (16 Dec 2015) - - 16 Dec 2015; Horea Christian +metadata.xml, - +nipy-data-0.2.ebuild: - sci-libs/nipy-data: new package