commit: 78241785859c81d96e24e12dd36836b5c23df1fd Author: gienah <gienah <AT> gentoo <DOT> org> AuthorDate: Sat Sep 27 11:22:30 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat Sep 27 11:22:30 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=78241785
Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas --- sci-libs/openblas/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 9f9c82e..39d360f 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -2,6 +2,7 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +<<<<<<< HEAD 06 Sep 2014; Mark Wright <gie...@gentoo.org> +openblas-0.2.11.ebuild, openblas-9999.ebuild, +files/openblas-0.2.11-openblas_config_header_same_between_ABIs.patch, @@ -23,6 +24,8 @@ 19 Feb 2014; Mark Wright <gie...@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 <gie...@gentoo.org> openblas-9999.ebuild: multibuild openblas when USE=int64 is specified.
