Matthew LeGendre 87db69478d Merge branch 'develop' into features/external-packages ... Conflicts: lib/spack/spack/package.py		2016-03-09 11:09:37 -08:00
..
docs	Merge branch 'develop' into features/external-packages	2016-03-09 11:09:37 -08:00
env	Fix bug in -Xlinker argument handling	2016-03-07 01:48:26 -08:00
external	Merge branch 'mplegendre-multi_pkgsrc_roots' into develop	2016-01-19 01:16:08 -08:00
llnl	Merge branch 'features/noexpand' into develop	2016-03-08 03:29:57 -08:00
spack	Merge branch 'develop' into features/external-packages	2016-03-09 11:09:37 -08:00