Todd Gamblin 0e422dec8c Merge pull request #1141 from adamjstewart/fixes/license_docs ... Fix missing code blocks in licensed software documentation		2016-06-30 02:22:38 -07: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 'efischer/160401-RecursiveModules' of https://github.com/citibeth/spack into citibeth-efischer/160401-RecursiveModules	2016-06-30 02:12:00 -07:00