[gentoo-commits] proj/sci:master commit in: /

[Christoph Junghans]

commit:     5b61046cc76b06a413b6a47acd22be971ef3abbe
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 22:34:38 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 22:34:38 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b61046c

Merge branch 'bump_trilinos'


 sci-libs/trilinos/ChangeLog                                         | 6 ++++++
 sci-libs/trilinos/Manifest                                          | 1 +
 .../trilinos/{trilinos-11.4.2.ebuild => trilinos-11.10.2.ebuild}    | 4 ++--
 sci-libs/trilinos/trilinos-11.4.2.ebuild                            | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)