diff options
| author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:34:53 -0600 |
|---|---|---|
| committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:34:53 -0600 |
| commit | b8444aa518b819c640269b262eb1069cc4d552e0 (patch) | |
| tree | c88d373fab8e09dae255ded8d37c6ad385960792 /.gitignore | |
| parent | a09bebcaea24a90072d0650760434be11fcf3f29 (diff) | |
| parent | e389afedaaa1e617aa3d1cb161535f6105e1b574 (diff) | |
| download | spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.gz spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.bz2 spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.xz spack-b8444aa518b819c640269b262eb1069cc4d552e0.zip | |
Merge remote-tracking branch 'upstream/develop' into package-opencv
* upstream/develop: (126 commits)
Fix indent/flake8 error.
openexr : Add new package
Set environment variables
Added gnu packages datamash, parallel, and screen
added package as argument to setup_platform_environment
ilmbase : Add new IlmBase package
Documented linker default
fixed flake errors
removed commented-out code
Set default link type to dynamic on cray. Includes hooks for platform-based environment changes
fixed flake errors
fixed flake errors
Improved cray_xc detection bug fix
Improved cray_xc detection
remove FIXMEs
Ensure that per-4.4.1 NetCDF doesn't use HDF5 1.10
Re-ignore licenses directory
Add "default" configuration scope.
Draft CDO
Make frontend OS on Cray machines a proper linux distro.
...
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 040df3eafd..960b5b0035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ /var/spack/stage /var/spack/cache *.pyc -/opt/ +/opt *~ .DS_Store .idea -/etc/spack/* +/etc/spack/licenses +/etc/spack/*.yaml /etc/spackconfig /share/spack/dotkit /share/spack/modules |