Unverified Commit 01e7983a authored by Ward Poelmans's avatar Ward Poelmans
Browse files

Merge remote-tracking branch 'origin/develop' into keras

* origin/develop:
  more remarks
  Drop tests (takes too long)
  Fix typo in Theano
  Add forgotten dep: nose-parameterized
  Added Theano/0.8.2 for intel/2016b + Python 3.5.2
  remove --with-tcl-config/--with-tk-config from R easyconfig, already done in R easyblock
  removed build statistics
  add easyconfig Java-1.6.0_24.eb
  GStreamer and GST-plugins-base 0.10 versions
  resolve dep conflicts
  add easyconfig Boost-1.61.0-foss-2016b.eb, add easyconfig GROMACS-5.1.4-foss-2016b-hybrid.eb, add easyconfig GROMACS-5.1.4-foss-2016b-mt.eb
  expat and GST version
  newline removed
  removed comments
  wxPython with foss2016a
parents cf24b3d1 78b552e5
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