alalazo 6c00a13ed5 Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases ... Conflicts: var/spack/repos/builtin/packages/swiftsim/package.py		2016-07-18 08:49:24 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases	2016-07-18 08:49:24 +02:00