Commit 65e1504f authored by Kenneth Hoste's avatar Kenneth Hoste
Browse files

Merge remote-tracking branch 'github_pescobar/samtools_homepage' into samtools1.1

Conflicts:
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-goalf-1.1.0-no-OFED.eb
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-goolf-1.4.10.eb
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-ictce-4.0.6.eb
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.18-ictce-5.3.0.eb
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-goolf-1.4.10.eb
	easybuild/easyconfigs/s/SAMtools/SAMtools-0.1.19-ictce-5.5.0.eb
parents 3d51ec0e fc7b412f
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