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)
1  2 
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java

Simple merge