Merge branch 'develop' into spike/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Mon, 5 Dec 2016 21:48:02 +0000 (21:48 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 5 Dec 2016 21:48:02 +0000 (21:48 +0000)
commit8e17da7d229e2cebf187a8b14a1d3f59c3f13774
tree88a6c451400d43646ec852fb20a7476431ca1f15
parentcb251c31c3d312d85d5374ee702182c297252692
parent17fa35af8bae6956fdee231e10ef5928f34ca810
Merge branch 'develop' into spike/JAL-1950_hmmer3client
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignViewport.java
src/jalview/util/Comparison.java
src/jalview/util/HttpUtils.java
src/jalview/ws/rest/RestClient.java
test/jalview/ws/rest/ShmmrRSBSService.java