From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/
Date: Mon, 6 Oct 2014 05:56:38 +0000 (UTC) [thread overview]
Message-ID: <1411817301.f487803ec21a1ee723327b55fa10292146fe1d2c.jlec@gentoo> (raw)
commit: f487803ec21a1ee723327b55fa10292146fe1d2c
Author: gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:28:21 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:28:21 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f487803e
Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas
---
sci-libs/openblas/ChangeLog | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog
index 39d360f..9f9c82e 100644
--- a/sci-libs/openblas/ChangeLog
+++ b/sci-libs/openblas/ChangeLog
@@ -2,7 +2,6 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
-<<<<<<< HEAD
06 Sep 2014; Mark Wright <gienah@gentoo.org> +openblas-0.2.11.ebuild,
openblas-9999.ebuild,
+files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch,
@@ -24,8 +23,6 @@
19 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
Thanks to sfabbro: dodoc should be outside the function, they do not change
-=======
->>>>>>> multibuild openblas when USE=int64 is specified.
18 Feb 2014; Mark Wright <gienah@gentoo.org> openblas-9999.ebuild:
multibuild openblas when USE=int64 is specified.
next reply other threads:[~2014-10-06 5:56 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-06 5:56 Justin Lecher [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-08-28 7:37 [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/ Benda XU
2017-08-25 6:28 Benda XU
2017-06-06 4:12 Benda XU
2017-04-30 10:25 Justin Lecher
2017-04-02 4:21 Benda XU
2016-02-21 15:16 Justin Lecher
2015-11-30 10:58 Justin Lecher
2015-11-30 10:58 Justin Lecher
2015-06-06 10:23 Justin Lecher
2015-06-06 10:23 Justin Lecher
2015-04-02 10:15 Justin Lecher
2015-04-02 10:15 Justin Lecher
2015-03-27 20:25 Denis Dupeyron
2014-10-20 18:01 Justin Lecher
2014-10-20 12:32 Mark Wright
2014-10-19 10:21 Mark Wright
2014-10-19 5:55 Mark Wright
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-10-06 5:56 Justin Lecher
2014-01-06 18:33 Justin Lecher
2013-08-06 15:49 Sebastien Fabbro
2013-07-24 23:09 Sebastien Fabbro
2013-03-03 18:39 Sebastien Fabbro
2013-03-03 18:39 Sebastien Fabbro
2012-12-12 19:28 Sebastien Fabbro
2012-10-15 20:15 Andrea Arteaga
2012-10-08 17:35 Andrea Arteaga
2012-08-20 9:21 Andrea Arteaga
2012-06-26 22:27 Sebastien Fabbro
2012-05-07 14:57 Andrea Arteaga
2012-05-07 14:50 Andrea Arteaga
2012-03-23 20:45 Andrea Arteaga
2012-03-16 21:41 Sebastien Fabbro
2012-03-15 22:08 Francois Bissey
2012-03-15 22:01 Francois Bissey
2012-03-15 2:34 Francois Bissey
2011-08-17 17:21 Alexey Shvetsov
2011-08-17 15:45 Sebastien Fabbro
2011-08-16 23:51 Francois Bissey
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=1411817301.f487803ec21a1ee723327b55fa10292146fe1d2c.jlec@gentoo \
--to=jlec@gentoo.org \
--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