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

Merge branch 'develop' into libXp102_intel2015a 

Conflicts:
	easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
parents 7bdf12ff f1ddb0cf
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