Merge branch 'develop' into trial_merge/JAL-1950 spike/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Mon, 21 Aug 2017 18:57:44 +0000 (19:57 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 21 Aug 2017 18:57:44 +0000 (19:57 +0100)
commit9f70ff4b6d193b340031997634c9e3602486bc8e
tree5d7bd63a293075ac7737d94e8a0acd4eb602c0ba
parent76844c43faeeeba369deaf42f1998ca0fb33d956
parent3b837cb360251a18429609ed777a0386d220fa31
Merge branch 'develop' into trial_merge/JAL-1950

 Conflicts:
src/jalview/gui/RestServiceEditorPane.java
src/jalview/schemes/AnnotationColourGradient.java
src/jalview/ws/rest/RestClient.java
src/jalview/ws/rest/RestJobThread.java
Shmmr client definition refactored.
AnnotationColourGradient includes 'fade to grey' P-value+E-value shading
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/RestServiceEditorPane.java
src/jalview/schemes/AnnotationColourGradient.java
src/jalview/util/Comparison.java
src/jalview/ws/rest/RestClient.java
src/jalview/ws/rest/RestJobThread.java