Todd Gamblin 890df7153a Merge branch 'efischer/160311-StagedPackage' of https://github.com/citibeth/spack into citibeth-efischer/160311-StagedPackage		2016-07-04 00:27:32 -07:00
..
docs	Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage	2016-06-30 09:13:24 -04: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 'efischer/160311-StagedPackage' of https://github.com/citibeth/spack into citibeth-efischer/160311-StagedPackage	2016-07-04 00:27:32 -07:00