Skip to content
GitLab
Commit 3ec9c873 authored by Toon Willems's avatar Toon Willems
Browse files

Merge branch 'develop' into enforce-consistent-eb-naming 

Conflicts:
	easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb
parents b2d441bd fec03655
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