Todd Gamblin 8d6342c53d Merge branch 'mplegendre-multi_pkgsrc_roots' into develop ... - This moves var/spack/packages to var/spack/repos/builtin/packages. - Packages that did not exist in the source branch, or were changed in develop, were moved into var/spack/repos/builtin/packages as part of the integration. Conflicts: lib/spack/spack/test/unit_install.py var/spack/repos/builtin/packages/clang/package.py		2016-01-19 01:16:08 -08:00
..
package.py	Merge branch 'mplegendre-multi_pkgsrc_roots' into develop	2016-01-19 01:16:08 -08:00
patch_gcc_5.txt	Merge branch 'develop' into mplegendre-multi_pkgsrc_roots	2015-12-25 16:35:55 -08:00