Merge branch 'develop' into feature/JAL-4159_pasimap
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 16 May 2024 07:07:17 +0000 (08:07 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 16 May 2024 07:07:17 +0000 (08:07 +0100)
commit37c507c5ed74c4b1564556a19d0bc651f8dccc2d
tree876f21520d616a533b02cac81c3f37e15b07065c
parenta3fac343a7a385f8ec33a739ada884ebd0e170d8
parentef7125ccaa49531e0f0930955af7a1710f6c4372
Merge branch 'develop' into feature/JAL-4159_pasimap
doesn't seem to have apache-math present
 Conflicts:
build.gradle
15 files changed:
build.gradle
help/markdown/releases/release-2_11_3_0.md
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignSeq.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/Desktop.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/PairwiseAlignPanel.java
src/jalview/gui/ProgressBar.java
src/jalview/gui/StructureChooser.java
src/jalview/gui/WebserviceInfo.java
src/jalview/math/Matrix.java
src/jalview/viewmodel/AlignmentViewport.java