Skip to content
GitLab
Commit da295b19 authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge branch 'develop' into 99_function_renaming 

Conflicts:
	easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
	easybuild/framework/easyblock.py
	easybuild/tools/filetools.py
parents 79b373ef 705775d1
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