|
Gitlab User
|
03ba07a5429bb19cc81bbfd44d240e002481877b
03ba07a5429bb19cc81bbfd44d240e002481877b |
Merge branch 'feature/JAL-4386_JAL-4435_trees_from_annotations_on_alignment_2114_update' into trial_merge_JAL-4386
# Conflicts:
# src/jalview/analysis/AAFrequency.java
# src/jalview/analysis/AlignmentUtils.java
# src/jalview/analysis/PaSiMap.java
# src/jalview/analysis/ccAnalysis.java
# src/jalview/analysis/scoremodels/ScoreModels.java
# src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java
# src/jalview/api/AlignViewportI.java
# src/jalview/datamodel/SequenceGroup.java
# src/jalview/gui/PaSiMapPanel.java
# src/jalview/gui/PairwiseAlignPanel.java
# src/jalview/gui/PopupMenu.java
# src/jalview/gui/SliderPanel.java
# src/jalview/jbgui/GAlignFrame.java
# src/jalview/jbgui/GPaSiMapPanel.java
# src/jalview/project/Jalview2XML.java
# src/jalview/renderer/AnnotationRenderer.java
# src/jalview/renderer/ResidueShader.java
# src/jalview/util/Constants.java
# src/jalview/viewmodel/AlignmentViewport.java
# test/jalview/analysis/AlignmentUtilsTests.java |
|
|
|
Gitlab User
|
e6d7db13cbe8bc862bd669d138e84d5200673a96
m e6d7db13cbe8bc862bd669d138e84d5200673a96 |
Merge branch 'develop' into feature/JAL-4386_calculate_tree_using_secondary_structure_annotation |
|
|
|
Gitlab User
|
be288e5f7036e8a55928ac18820fc47572d6b0ff
m be288e5f7036e8a55928ac18820fc47572d6b0ff |
JAL-4418 sign off JAL-4454 and convert markdown header to html for whatsNew 'experimental' |
|
|
|
Gitlab User
|
8e8ae2a3b94b347f7fd6dee43d5952c8d116662f
m 8e8ae2a3b94b347f7fd6dee43d5952c8d116662f |
Merge branch 'bug/JAL-4427_HTML_code_in_sequence_ID_text' into develop |
|
|
|
Gitlab User
|
3d816f4854b3283c2764327065f63fc2d46e50ff
m 3d816f4854b3283c2764327065f63fc2d46e50ff |
JAL-4418 sign off JAL-4427 JAL-4451 fix |
|
