Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
authorBen Soares <b.soares@dundee.ac.uk>
Wed, 12 Apr 2023 14:49:00 +0000 (15:49 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Wed, 12 Apr 2023 14:49:00 +0000 (15:49 +0100)
commitb7e9e2edf0c1557089eff0e4b5c17c0b31e698c2
treee57be98f51a2b61dab21a423321352d4156a5e77
parent10d0fcd66355b5444126323e209241a414287518
parent4c2789fc5d5f3ccc8ef55d833d3c87dcb45956c2
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629
src/jalview/datamodel/ContactMatrix.java
src/jalview/datamodel/ContactMatrixI.java
src/jalview/datamodel/SeqDistanceContactMatrix.java
src/jalview/io/NewickFile.java
src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
src/jalview/ws/dbsources/EBIAlfaFold.java
test/jalview/project/Jalview2xmlTests.java