Merge branch 'develop' into feature/JAL-4386_calculate_tree_using_secondary_structure...
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 25 Jul 2024 14:04:14 +0000 (15:04 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 25 Jul 2024 14:04:14 +0000 (15:04 +0100)
commitf2439f8196e6cd04fd42683c2cb73d7486f886f4
treee292e4d32bbeaeae395e5c9872cc7acf22b4bdde
parente8ca868ba1549b359ab12585147eb4c66cbe2a53
parente707f26dca29e3fac6566c1d813f3aa9baac44e2
Merge branch 'develop' into feature/JAL-4386_calculate_tree_using_secondary_structure_annotation

 Conflicts:
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
src/jalview/viewmodel/AlignmentViewport.java
resources/lang/Messages.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PCAPanel.java
src/jalview/project/Jalview2XML.java
src/jalview/viewmodel/AlignmentViewport.java