alalazo 40cb314638 Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases ... Conflicts: lib/spack/spack/package.py		2016-07-20 21:02:19 +02:00
..
docs	Merge pull request #1252 from hartzell/patch-5	2016-07-17 21:20:02 -07:00
env	Let packages call use_cray_compilers() in install to get , etc set to cray names	2016-07-18 15:43:21 -07:00
external	Correct LLNL LGPL license template for clarity.	2016-05-11 21:22:25 -07:00
llnl	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases	2016-07-20 21:02:19 +02:00
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases	2016-07-20 21:02:19 +02:00