Merge develop into feature/JAL-4386_calculate_tree_using_secondary_structure_annotation feature/JAL-4386_calculate_tree_using_secondary_structure_annotation
authorRenia Correya <rcorreya001@dundee.ac.uk>
Wed, 25 Sep 2024 14:48:53 +0000 (15:48 +0100)
committerRenia Correya <rcorreya001@dundee.ac.uk>
Wed, 25 Sep 2024 14:48:53 +0000 (15:48 +0100)
commit2940d9c01539dd10962eb201ec7f0cb0eb905be9
tree0b00474cad601c03a21ee438b20f5d78425503d1
parente6d7db13cbe8bc862bd669d138e84d5200673a96
parent839b67dfeae7dc17cc31bfd9035f70b22655995b
Merge develop into feature/JAL-4386_calculate_tree_using_secondary_structure_annotation

Resolved merge conflicts in Messages.properties, GAlignFrame.java, AlignmentViewport.java, and SecondaryStructureConsensusThread.java
13 files changed:
resources/lang/Messages.properties
src/jalview/analysis/AAFrequency.java
src/jalview/analysis/AlignmentAnnotationUtils.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/SecondaryStructureConsensusThread.java
test/jalview/renderer/ResidueShaderTest.java