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

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

author	Jim Procter <jprocter@dundee.ac.uk>
	Fri, 15 Nov 2024 17:08:29 +0000 (17:08 +0000)
committer	Jim Procter <jprocter@dundee.ac.uk>
	Fri, 15 Nov 2024 17:08:29 +0000 (17:08 +0000)
commit	5e8bd075739b756cac8f741a47a7de952c45f879
tree	0ac3978c42693f5a641299d5f40f89b3f219ba50	tree \| snapshot
parent	1c79fdcc0d6c6c934767a6a04e192b262ec78de3	commit \| diff
parent	c1aa510c36a5c12a76bfebcaa57157f3d82e8d76	commit \| diff

Merge branch 'spikes/JAL-4366_3di_msa_forfoldseeks' into spike/JAL-4366_JAL-4386_JAL-4435_expandedmsafromstructure

Conflicts:
resources/lang/Messages.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java
src/jalview/api/AlignViewportI.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/CalculationChooser.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/SecondaryStructureConsensusThread.java

24 files changed:

resources/lang/Messages.properties	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AAFrequency.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AlignmentAnnotationUtils.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AlignmentUtils.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java	diff1 \|	diff2 \|	blob \| history
src/jalview/api/AlignViewportI.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/Alignment.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/AlignmentAnnotation.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/SequenceGroup.java	diff1 \|	diff2 \|	blob \| history
src/jalview/ext/jmol/JalviewJmolBinding.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignViewport.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AnnotationLabels.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/CalculationChooser.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/PopupMenu.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Preferences.java	diff1 \|	diff2 \|	blob \| history
src/jalview/jbgui/GAlignFrame.java	diff1 \|	diff2 \|	blob \| history
src/jalview/project/Jalview2XML.java	diff1 \|	diff2 \|	blob \| history
src/jalview/renderer/AnnotationRenderer.java	diff1 \|	diff2 \|	blob \| history
src/jalview/structure/StructureSelectionManager.java	diff1 \|	diff2 \|	blob \| history
src/jalview/viewmodel/AlignmentViewport.java	diff1 \|	diff2 \|	blob \| history
src/jalview/workers/SecondaryStructureConsensusThread.java	diff1 \|	diff2 \|	blob \| history
test/jalview/analysis/AlignmentUtilsTests.java	diff1 \|	diff2 \|	blob \| history
test/jalview/renderer/ResidueShaderTest.java	diff1 \|	diff2 \|	blob \| history

RSS Atom

resources/lang/Messages.properties	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AAFrequency.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AlignmentAnnotationUtils.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/AlignmentUtils.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java	diff1 \|	diff2 \|	blob \| history
src/jalview/api/AlignViewportI.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/Alignment.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/AlignmentAnnotation.java	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/SequenceGroup.java	diff1 \|	diff2 \|	blob \| history
src/jalview/ext/jmol/JalviewJmolBinding.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignViewport.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AnnotationLabels.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/CalculationChooser.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/PopupMenu.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Preferences.java	diff1 \|	diff2 \|	blob \| history
src/jalview/jbgui/GAlignFrame.java	diff1 \|	diff2 \|	blob \| history
src/jalview/project/Jalview2XML.java	diff1 \|	diff2 \|	blob \| history
src/jalview/renderer/AnnotationRenderer.java	diff1 \|	diff2 \|	blob \| history
src/jalview/structure/StructureSelectionManager.java	diff1 \|	diff2 \|	blob \| history
src/jalview/viewmodel/AlignmentViewport.java	diff1 \|	diff2 \|	blob \| history
src/jalview/workers/SecondaryStructureConsensusThread.java	diff1 \|	diff2 \|	blob \| history
test/jalview/analysis/AlignmentUtilsTests.java	diff1 \|	diff2 \|	blob \| history
test/jalview/renderer/ResidueShaderTest.java	diff1 \|	diff2 \|	blob \| history