Todd Gamblin 8cc2298181 Merge branch 'features/python-2.6-compatibility' into develop ... - Changed 'import argparse' to 'from external import argparse' in conflicts. Conflicts: lib/spack/spack/cmd/dotkit.py lib/spack/spack/cmd/unuse.py lib/spack/spack/cmd/use.py		2014-08-20 09:30:40 -07:00
..
spack	Merge branch 'features/python-2.6-compatibility' into develop	2014-08-20 09:30:40 -07:00
spack-python	Script to make 'spack python' usable across platforms in shebang scripts.	2014-01-13 04:59:23 +01:00