Unverified Commit 94ac0d95 authored by Ward Poelmans's avatar Ward Poelmans
Browse files

Merge branch 'develop' into gnuplot

* develop: (62 commits)
  fix typo in patch filename
  add easyconfig for ctffind v4.0.8 with intel/2014b
  style fixes in ctffind v140609 easyconfigs
  OpenSSL optional dependency (commented out)
  Empty lines deleted
  Update Kerberos_V5-1.12.2-intel-2014b.eb
  rainling whitespaces removed
  add -wd175 to $CFLAGS to disable error when building binutils with Intel compilers
  also fix wiktor.jurkowski@tgac.ac.uk
  be fair about where NTUA is listed
  fix Valgrind header, too
  2012-2014
  Uni.Lu/LCSB, NTUA
  fotis@cern.ch
  style fixes
  add buildopts to make sure right compiler is used
  Dependencies in separate lines
  Dependencies in separate lines
  Dependencies in separate lines
  add easyconfig for BEDTools v2.22.0 with intel/2014b
  ...

Conflicts:
	easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
parents 882adb7a 4706321a
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