Unverified Commit feac43f1 authored by Ward Poelmans's avatar Ward Poelmans
Browse files

Merge branch 'develop' into gnuplot5

* develop: (105 commits)
  some style fixes
  added HPL easyconfig for test
  iomkl-2015.01
  fix remarks
  fix remarks
  include both lib and lib64 options in libffi sanity check (bis)
  pinomp version of likwid does not work, removing
  include both lib and lib64 options in libffi sanity check
  include both lib and lib64 options in libffi sanity check
  Added pinomp version of likwid
  Fix remark for likwid
  add easyconfig for Qt 4.8.6 with intel/2015a
  add easyconfig for Qt 4.8.6 with goolf/1.5.14
  Likwid with intel/2015a
  add easyconfig for R 3.1.2 with goolf/1.5.14
  add OpenSSL 1.0.1k easyconfig with goolf/1.5.14
  add easyconfig for Python 2.7.9 with goolf/1.5.14
  cleanup spacing, order etc
  changing to builddeps and reformatting
  style cleanup for libtool per comments
  ...

Conflicts:
	easybuild/easyconfigs/n/NASM/NASM-2.11.06-intel-2015a.eb
parents 22feb6bf b8c2e1be
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