Merge branch 'jims/JAL-4386_from_renia' into spike/JAL-4386_generate_multiple_leaves_... spike/JAL-4386_generate_multiple_leaves_for_ss_sources
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 26 Jul 2024 10:17:24 +0000 (11:17 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 26 Jul 2024 10:17:24 +0000 (11:17 +0100)
commita92d9ee8c25e41770bf745b793262f9a7937893e
tree153f1352d966ed96f982b5ddc77038e1d760787c
parent5e59e8410d369c7ee653f1442c28198d75efbb30
parenta16e52efe8a069302d4aaa8230ed0dc2e592bcf4
Merge branch 'jims/JAL-4386_from_renia' into spike/JAL-4386_generate_multiple_leaves_for_ss_sources

 Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/gui/CalculationChooser.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/TreeCanvas.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/structure/StructureSelectionManager.java