git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8135460 044e544)
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects features/JAL-3858_PAEsInProjects
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 24 Feb 2023 15:13:37 +0000 (15:13 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 24 Feb 2023 15:13:37 +0000 (15:13 +0000)
commita939b4c646235d460df3b7b9377ef8d8569caaff
treee094f477f97cd2658946a082b6b79721dcd05284tree | snapshot
parent8135460a52c0551e4a40777d077843fd4e19c049commit | diff
parent044e544652fa3a8205bdaae8303a03913fe812e8commit | diff
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects

 Conflicts:
src/jalview/bin/Jalview.java
src/jalview/bin/Jalview.java diff1 | diff2 | blob | history
src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java diff1 | diff2 | blob | history