git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 894aa1c 5cb4c15)
Merge branch 'merge/JAL-3285_mchmmer_with_211_develop' into alpha/JAL-3362_Jalview_21...
authorJim Procter <jprocter@issues.jalview.org>
Mon, 15 Jul 2019 16:21:05 +0000 (17:21 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 15 Jul 2019 16:21:05 +0000 (17:21 +0100)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history

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