alalazo 78ae5d7723 Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config ... Conflicts: lib/spack/spack/config.py		2016-05-11 16:11:19 +02:00
..
docs	Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config	2016-05-11 16:11:19 +02:00
env	Allow compilers to specify their own rpath linking flags	2016-05-09 16:59:39 -05:00
external	Merge branch 'mplegendre-multi_pkgsrc_roots' into develop	2016-01-19 01:16:08 -08:00
llnl	Merge branch 'features/blas-lapack-hardening' into develop	2016-03-31 11:37:09 -07:00
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/custom_modulefile_from_config	2016-05-11 16:11:19 +02:00