Massimiliano Culpo ba1ada5424 Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh_reworking ... Conflicts: lib/spack/spack/cmd/module.py		2016-06-30 22:19:46 +02:00
..
docs	Merge pull request #1141 from adamjstewart/fixes/license_docs	2016-06-30 02:22:38 -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	Fix backup logic in filter_file	2016-06-23 16:44:41 -05:00
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/module_refresh_reworking	2016-06-30 22:19:46 +02:00