git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 265e81c 471cfb5)
Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID spike/JAL-4047/JAL-4048_columns_in_sequenceID
authorJames Procter <j.procter@dundee.ac.uk>
Thu, 14 Sep 2023 09:16:21 +0000 (10:16 +0100)
committerJames Procter <j.procter@dundee.ac.uk>
Thu, 14 Sep 2023 09:16:21 +0000 (10:16 +0100)
1  2 
src/jalview/api/AlignViewportI.java patch | diff1 | diff2 | blob | history
src/jalview/gui/IdCanvas.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.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/gui/IdCanvas.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge