Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Spack
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

049808a3

Commit 049808a3 authored 10 years ago by Todd Gamblin

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/features/SPACK-46' into develop

Conflicts:
	lib/spack/docs/packaging_guide.rst

parents daef78f5 2755171e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/spack/docs/conf.py 10 additions, 4 deletions

lib/spack/docs/conf.py
lib/spack/docs/packaging_guide.rst 19 additions, 21 deletions

lib/spack/docs/packaging_guide.rst
lib/spack/spack/__init__.py 1 addition, 1 deletion

lib/spack/spack/__init__.py
lib/spack/spack/cmd/package-list.py 5 additions, 4 deletions

lib/spack/spack/cmd/package-list.py

with 35 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment