1. 09 Dec, 2014 4 commits
    • Jens Timmerman's avatar
      Merge pull request #17 from boegel/RELION · 0852f45c
      Jens Timmerman authored
      style fixes
      0852f45c
    • Kenneth Hoste's avatar
      style fixes · 391d575f
      Kenneth Hoste authored
      391d575f
    • Jens Timmerman's avatar
      Merge pull request #16 from boegel/RELION · 64716706
      Jens Timmerman authored
      sync with develop & resolve conflicts
      64716706
    • Kenneth Hoste's avatar
      Merge branch 'develop' into RELION · b7852e37
      Kenneth Hoste authored
      Conflicts:
      	easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2014b.eb
      	easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2014b.eb
      	easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-intel-2014b.eb
      	easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb
      	easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb
      	easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
      	easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
      	easybuild/easyconfigs/n/ncurses/ncurses-5.9-foss-2014b.eb
      	easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
      	easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb
      	easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb
      b7852e37
  2. 07 Dec, 2014 1 commit
  3. 03 Dec, 2014 6 commits
  4. 28 Nov, 2014 4 commits
  5. 27 Nov, 2014 2 commits
  6. 25 Nov, 2014 2 commits
  7. 22 Nov, 2014 2 commits
  8. 21 Nov, 2014 2 commits
  9. 20 Nov, 2014 2 commits
  10. 18 Nov, 2014 1 commit
  11. 13 Nov, 2014 1 commit
  12. 04 Nov, 2014 5 commits
  13. 30 Oct, 2014 3 commits
  14. 28 Oct, 2014 1 commit
  15. 27 Oct, 2014 1 commit
  16. 26 Oct, 2014 1 commit
  17. 17 Oct, 2014 2 commits