diff options
| author |   gienah <gienah@gentoo.org> | 2014-09-27 21:28:21 +1000 |
|---|---|---|
| committer | gienah <gienah@gentoo.org> | 2014-09-27 21:28:21 +1000 |
| commit | f487803ec21a1ee723327b55fa10292146fe1d2c (patch) | |
| tree | bbed01b372aa81f179be87df55e561e0e8e3b9e5 /sci-libs | |
| parent | Fix rebase lapack-multibuild to master conflict 3 on sci-libs/openblas (diff) | |
| download | sci-f487803ec21a1ee723327b55fa10292146fe1d2c.tar.gz sci-f487803ec21a1ee723327b55fa10292146fe1d2c.tar.bz2 sci-f487803ec21a1ee723327b55fa10292146fe1d2c.zip | |
Fix rebase lapack-multibuild to master conflict 5 on sci-libs/openblas
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/openblas/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 39d360fc7..9f9c82ebc 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. |