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

Merge branch 'develop' into pr400 

Conflicts:
	easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-5.3.0-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
	easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0.eb
	easybuild/easyconfigs/b/Boost/Boost-1.53.0-goolf-1.4.10.eb
	easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
	easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-ictce-5.3.0.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.3.0.eb
parents 479925f3 62e83fef
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