Merge branch 'bug/JAL-2983negativeSliderMin' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 3 Aug 2020 09:40:46 +0000 (10:40 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 3 Aug 2020 09:40:46 +0000 (10:40 +0100)
commit4160e6f1fa6aa45849153cce5794faa93e3a19c4
tree1cb7a67817afc6e5a209ac248092421720f10994
parent033962da90469745dd6639a1346ecbcbe2ed071f
parent37668aa43e535d99d5745880cef6eb0aeb1dd422
Merge branch 'bug/JAL-2983negativeSliderMin' into develop

 Conflicts:
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/AnnotationColumnChooser.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java