git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6bad6f c8ca1bd)
Merge branch 'releases/Release_2_11_1_Branch' into task/JAL-3608_and_JAL-3609_merged_...
authorBen Soares <b.soares@dundee.ac.uk>
Wed, 8 Jul 2020 13:37:24 +0000 (14:37 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Wed, 8 Jul 2020 13:37:24 +0000 (14:37 +0100)
1  2 
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge