Merge branch 'develop' into spike/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Thu, 31 May 2018 12:41:36 +0000 (13:41 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 31 May 2018 12:41:36 +0000 (13:41 +0100)
commit1b0f0d6c0a343e67453ed4f7e1ca3f9c2a7a6ff2
tree49d1acdd16153216ce2a053b7ee9a14d60723a05
parentba2312aee832027b7dcf53d7b2cc1325948b2821
parent86b84a537a05d03a21ba115bffe3575cedf98be0
Merge branch 'develop' into spike/JAL-1950_hmmer3client
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java