git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c956ba7
bc7ebbb
)
Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace
author
James Procter
<j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 18:49:04 +0000
(18:49 +0000)
committer
James Procter
<j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 18:49:04 +0000
(18:49 +0000)
Conflicts: - JAL-4250
src/jalview/renderer/AnnotationRenderer.java
1
2
src/jalview/renderer/AnnotationRenderer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/jalview/renderer/AnnotationRenderer.java
Simple merge
git://source.jalview.org / jalview.git / commitdiff