commit:     94ccfefeae527bda63c1f0d368f4ccebf27ad761
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Nov 13 10:01:23 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Fri Nov 13 10:01:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=94ccfefe

Merge branch 'master' of git+ssh://git.gentoo.org/proj/sci

 dev-python/arrayfire-python/ChangeLog              |   6 +
 dev-python/arrayfire-python/Manifest               |   1 +
 ...ebuild => arrayfire-python-3.1.20151111.ebuild} |   0
 profiles/use.local.desc                            |   1 -
 sci-chemistry/pymol-apbs-plugin/ChangeLog          |  27 -----
 sci-chemistry/pymol-apbs-plugin/metadata.xml       |   8 --
 .../pymol-apbs-plugin-9999.ebuild                  |  41 -------
 sci-chemistry/pymol/metadata.xml                   |   1 -
 sci-chemistry/pymol/pymol-9999.ebuild              |  11 +-
 sci-libs/armadillo/ChangeLog                       |   7 ++
 sci-libs/armadillo/Manifest                        |   3 +-
 sci-libs/armadillo/armadillo-5.500.2.ebuild        | 121 ---------------------
 ...llo-5.400.2.ebuild => armadillo-6.200.3.ebuild} |   2 +-
 sci-libs/nipype/ChangeLog                          |   3 +
 sci-libs/nipype/nipype-9999.ebuild                 |   1 +
 15 files changed, 24 insertions(+), 209 deletions(-)

Reply via email to