Merge branch 'develop' into trialmerge/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Tue, 12 Apr 2016 14:19:10 +0000 (15:19 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 12 Apr 2016 14:19:10 +0000 (15:19 +0100)
commit808f36e6bb443068330ec5c19b89e2dc1c9b0bd0
tree46f7aed6b26e76d5ef5b1ae3f20291627e3cb9aa
parent237d623c567d7f02a2db69b9de00237495087a16
parent9cf7cc96d9e7b582e2c1b1b5fd85924ba3117c42
Merge branch 'develop' into trialmerge/JAL-1950_hmmer3client
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java
src/jalview/util/Comparison.java