2 Commits

Author	SHA1	Message	Date
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
Todd Gamblin	c65fd3a289	Merge branch 'develop' into mplegendre-multi_pkgsrc_roots ... Conflicts: lib/spack/spack/cmd/create.py lib/spack/spack/cmd/extensions.py lib/spack/spack/cmd/fetch.py lib/spack/spack/cmd/uninstall.py lib/spack/spack/config.py lib/spack/spack/database.py lib/spack/spack/directory_layout.py lib/spack/spack/packages.py lib/spack/spack/spec.py	2015-12-25 16:35:55 -08:00