Merge branch 'feature/JAL-4446_cancellable_pasimap_etal' into feature/JAL-4159_pasima... feature/JAL-4159_pasimap_JAL-4423_alt_msa_source
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 19 Aug 2024 16:49:32 +0000 (17:49 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 19 Aug 2024 16:49:32 +0000 (17:49 +0100)
commit1a2a4ce555a75c3c0cf2929ee346ff13e883c3c6
tree6d2ec6a9ac21c97dc45b52deeed4b109050d2768
parentadfc6a43209b833b6c4fa7c68fbebbf6d0ba0834
parente69db6fc850b0e89328bb2dbc3d371930fa6c595
Merge branch 'feature/JAL-4446_cancellable_pasimap_etal' into feature/JAL-4159_pasimap_JAL-4423_alt_msa_source

 Conflicts:
src/jalview/analysis/PaSiMap.java
src/jalview/gui/PaSiMapPanel.java
src/jalview/viewmodel/PaSiMapModel.java
src/jalview/analysis/PaSiMap.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PaSiMapPanel.java
src/jalview/viewmodel/PaSiMapModel.java