Skip to content
GitLab
Commit 3649d9dc authored by Joachim Hein's avatar Joachim Hein
Browse files

Merge remote-tracking branch 'easybuilders/develop' into h5py-in-foss-2017a 

# Conflicts:
#	easybuild/easyconfigs/h/HDF5/HDF5-1.10.1-foss-2017a.eb

Resolved by selecting the newer Szip 2.1.1
parents c5fb6783 4d3bd0ee
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment