Merge branch 'features/mchmmer' of https://source.jalview.org/git/jalview.git into...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Apr 2018 17:44:41 +0000 (18:44 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Apr 2018 17:44:41 +0000 (18:44 +0100)
commitd31b51985d01217340aa5f6470d3fd3c2314e3eb
tree99973560bf8c99e65c282189c3ff2afcfea42691
parent5e22c6b15dc429055036c19fcfc48c16d37d7ad0
parentff638b98db095ffd7dc792f5d91fe5a0de6fc2ba
Merge branch 'features/mchmmer' of https://source.jalview.org/git/jalview.git into features/mchmmer

Conflicts:
src/jalview/hmmer/HmmerCommand.java
.classpath
src/jalview/hmmer/HMMAlign.java
src/jalview/hmmer/HMMBuild.java
src/jalview/hmmer/HMMSearch.java
src/jalview/hmmer/HmmerCommand.java