alalazo b4b9ebe7d7 Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases ... Conflicts: lib/spack/llnl/util/tty/log.py lib/spack/spack/__init__.py lib/spack/spack/cmd/install.py lib/spack/spack/cmd/setup.py lib/spack/spack/package.py var/spack/repos/builtin/packages/blitz/package.py var/spack/repos/builtin/packages/gmp/package.py var/spack/repos/builtin/packages/qhull/package.py var/spack/repos/builtin/packages/szip/package.py		2016-08-11 08:55:20 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases	2016-08-11 08:55:20 +02:00