Merge branch 'develop' into features/JAL-4366_foldseek_3di_viewing
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 3 Sep 2024 13:38:20 +0000 (14:38 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 3 Sep 2024 13:50:10 +0000 (14:50 +0100)
commitc3551d9c3680ae6824dc5164e314cae10bb26b81
treefcca1b5023ba4fd60c02337a354c2cc6cd72f3e4
parentc605461a165b7d3ac4af8e0c4d7928f469ffe06b
parente7bfd7141229e93961d676431233487da4e7789b
Merge branch 'develop' into features/JAL-4366_foldseek_3di_viewing

 Conflicts:
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/scoremodels/ScoreModels.java
src/jalview/api/AlignViewportI.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PairwiseAlignPanel.java
test/jalview/gui/CalculationChooserTest.java
13 files changed:
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/scoremodels/ScoreModels.java
src/jalview/api/AlignViewportI.java
src/jalview/bin/Cache.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PairwiseAlignPanel.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/analysis/scoremodels/ScoreModelsTest.java
test/jalview/gui/CalculationChooserTest.java