diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2014-08-20 09:30:40 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2014-08-20 09:30:40 -0700 |
| commit | 8cc2298181140634cb0384026480da46c19dbcad (patch) | |
| tree | 712cdec0eb7f5a267b11128bd9e9eab0a96a948a /.gitignore | |
| parent | 42e27d04c17b8f011a1882bb45f899187c8ffa59 (diff) | |
| parent | 48d5281e3a9142ded1e67983a22dce3f5777e1b4 (diff) | |
| download | spack-8cc2298181140634cb0384026480da46c19dbcad.tar.gz spack-8cc2298181140634cb0384026480da46c19dbcad.tar.bz2 spack-8cc2298181140634cb0384026480da46c19dbcad.tar.xz spack-8cc2298181140634cb0384026480da46c19dbcad.zip | |
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions