git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8c998b dbdd2bd)
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-2349_JAL-3855
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 3 Feb 2023 14:14:49 +0000 (14:14 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 3 Feb 2023 14:14:49 +0000 (14:14 +0000)
1  2 
help/help/html/menus/alignmentMenu.html patch | diff1 | diff2 | blob | history
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AnnotationColumnChooser.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AnnotationLabels.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Finder.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/AnnotationLabels.java
Simple merge
diff --cc src/jalview/gui/Finder.java
Simple merge