source.jalview.org Git - jalview.git/commit

git://source.jalview.org / jalview.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3bb6983 a8367f0)

author	Jim Procter <jprocter@dundee.ac.uk>
	Thu, 4 Jul 2024 16:27:11 +0000 (17:27 +0100)
committer	Jim Procter <jprocter@dundee.ac.uk>
	Thu, 4 Jul 2024 16:27:11 +0000 (17:27 +0100)
commit	6d4a9ad85f539652408a58ee43f86ce99f0112bd
tree	e17722536d508d186aa88539c54303ed963ec0f3	tree \| snapshot
parent	3bb698360710c62e9d0a4c98830504d2790c44ae	commit \| diff
parent	a8367f07f487bcf754bd249b5f90889f7f630aa4	commit \| diff

Merge branch 'feature/JAL-4386_calculate_tree_using_secondary_structure_annotation' into spike/JAL-4386_generate_multiple_leaves_for_ss_sources

Conflicts:
src/jalview/analysis/AlignmentUtils.java

src/jalview/analysis/AlignmentUtils.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java	diff1 \|	diff2 \|	blob \| history