From: "Marius Brehler" <marbre@linux.sungazer.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/nipy-data/
Date: Mon, 8 Feb 2016 13:16:15 +0000 (UTC) [thread overview]
Message-ID: <1454687925.cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3.marbre@gentoo> (raw)
commit: cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3
Author: Horea Christian <h.chr <AT> mail <DOT> ru>
AuthorDate: Fri Feb 5 15:58:45 2016 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> 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 <h.chr@mail.ru> nipy-data-0.2.ebuild:
- sci-libs/nipy-data: removed unused eclasses, updated description
-
- 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
- sci-libs/nipy-data: no stable packages in the overlay
-
- 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
- sci-libs/nipy-data: removed emtpy deps
-
- 17 Dec 2015; Horea Christian <h.chr@mail.ru> 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 <h.chr@mail.ru> 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 <h.chr@mail.ru> nipy-data-0.2.ebuild:
- sci-libs/nipy-data: no stable packages in the overlay
-
- 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
- sci-libs/nipy-data: removed emtpy deps
-
- 17 Dec 2015; Horea Christian <h.chr@mail.ru> 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 <h.chr@mail.ru> +metadata.xml,
- +nipy-data-0.2.ebuild:
- sci-libs/nipy-data: new package
next reply other threads:[~2016-02-08 13:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 13:16 Marius Brehler [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-08 13:16 [gentoo-commits] proj/sci:master commit in: sci-libs/nipy-data/ Marius Brehler
2016-02-08 13:16 Marius Brehler
2020-03-24 3:41 Horea Christian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454687925.cc12ab13b6d3e6a0192a27f61f52fec2b2b625a3.marbre@gentoo \
--to=marbre@linux.sungazer.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox