Merge branch 'develop' into spike/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Sun, 25 Sep 2016 10:40:30 +0000 (11:40 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Sun, 25 Sep 2016 10:40:30 +0000 (11:40 +0100)
commit9f910def4cc980a0426be796256e5943651a3e26
treee7f5d159d8215d0975cfac179ce073c330c728d5
parent1fd9c7b7ff0611dcc2ffbfa21d5eb385ee9f1c82
parent95ebc3a82812460d83ac67795a5c9fd2f94a5224
Merge branch 'develop' into spike/JAL-1950_hmmer3client
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java
src/jalview/util/Comparison.java