1 |
commit: 5a9f57ae28065f2962d1ba6b586a6778af5d1681 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 25 15:08:53 2012 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 25 15:08:53 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5a9f57ae |
7 |
|
8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci |
9 |
|
10 |
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: |
11 |
sci-libs/blas-reference: Fix manifest |
12 |
sci-libs/lapack-reference: Fix manifest |
13 |
|
14 |
Conflicts: |
15 |
sci-libs/blas-reference/ChangeLog |
16 |
sci-libs/lapack-reference/ChangeLog |
17 |
|
18 |
|
19 |
metadata/layout.conf | 2 +- |
20 |
.../lapack-reference/lapack-reference-9999.ebuild | 4 ++-- |
21 |
2 files changed, 3 insertions(+), 3 deletions(-) |
22 |
|
23 |
diff --cc metadata/layout.conf |
24 |
index b499c53,b499c53..a0ba047 |
25 |
--- a/metadata/layout.conf |
26 |
+++ b/metadata/layout.conf |
27 |
@@@ -14,4 -14,4 +14,4 @@@ thin-manifests = tru |
28 |
sign-manifests = false |
29 |
|
30 |
# sign commits using git mechanisms |
31 |
--sign-commits = true |
32 |
++sign-commits = false |