Commit 9dc6928f authored by Toon Willems's avatar Toon Willems
Browse files

Merge branch 'develop' into 315-regtest-rework

Conflicts:
	easybuild/build.py
	easybuild/easyblocks/b/binary.py
	easybuild/easyblocks/c/cp2k.py
	easybuild/easyblocks/i/imkl.py
	easybuild/easyblocks/i/intelbase.py
	easybuild/easyblocks/l/libsmm.py
	easybuild/easyblocks/m/mvapich2.py
	easybuild/easyblocks/n/ncl.py
	easybuild/easyblocks/n/netcdf.py
	easybuild/easyblocks/n/netcdf_fortran.py
	easybuild/easyblocks/p/python.py
	easybuild/easyblocks/w/wps.py
	easybuild/easyblocks/w/wrf.py
	easybuild/tools/asyncprocess.py
	easybuild/tools/module_generator.py
parents 75963945 984a2191
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