git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27eec01 c38615c)
Merge branch 'features/JAL-2349_matrixvis' into features/JAL-2349_matrixvis_2112
authorJim Procter <j.procter@dundee.ac.uk>
Wed, 11 Aug 2021 17:02:20 +0000 (18:02 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Wed, 11 Aug 2021 17:02:20 +0000 (18:02 +0100)
1  2 
src/jalview/api/AlignViewportI.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AnnotationPanel.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/Alignment.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AnnotationPanel.java patch | diff1 | diff2 | blob | history
src/jalview/io/AppletFormatAdapter.java patch | diff1 | diff2 | blob | history
src/jalview/renderer/AnnotationRenderer.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/api/AlignViewportI.java
Simple merge
diff --cc src/jalview/datamodel/Alignment.java
Simple merge
diff --cc src/jalview/gui/AnnotationPanel.java
Simple merge