alalazo a96eb7096d Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh ... Conflicts: share/spack/setup-env.sh		2016-07-18 14:12:47 +02:00
..
docs	Merge pull request #1252 from hartzell/patch-5	2016-07-17 21:20:02 -07:00
env	Merge pull request #1032 from eschnett/eschnett/cc-quotes	2016-06-18 08:57:18 -07:00
external	Correct LLNL LGPL license template for clarity.	2016-05-11 21:22:25 -07:00
llnl	flake8 fixes	2016-07-16 07:58:51 +02:00
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh	2016-07-18 14:12:47 +02:00