Merge branch 'spike/JAL-1950_hmmer3client' into features/mchmmer_merge_JAL-1950
authorJim Procter <jprocter@issues.jalview.org>
Thu, 31 May 2018 12:48:14 +0000 (13:48 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 31 May 2018 12:48:14 +0000 (13:48 +0100)
commit09b8644607fb5b9debbfe39a7177922b0e66aa9a
tree960a18782daab5fe35e53e6efa41431166a8495a
parent31117f8593d9c51c6238be3d40771819da96939d
parent1b0f0d6c0a343e67453ed4f7e1ca3f9c2a7a6ff2
Merge branch 'spike/JAL-1950_hmmer3client' into features/mchmmer_merge_JAL-1950

 Conflicts:
src/jalview/gui/AlignViewport.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java