alalazo 47f6a6d3cf Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase ... Conflicts: lib/spack/spack/build_environment.py lib/spack/spack/package.py var/spack/repos/builtin/packages/astyle/package.py var/spack/repos/builtin/packages/lzo/package.py var/spack/repos/builtin/packages/openjpeg/package.py var/spack/repos/builtin/packages/swiftsim/package.py		2016-09-04 10:12:52 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase	2016-09-04 10:12:52 +02:00