git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3997675 92dc8d4)
Merge branch 'feature/JAL-3141_backupfiles_for211' into develop merge/develop_feature/JAL-3141_backupfiles_for211
authorJim Procter <jprocter@issues.jalview.org>
Thu, 28 Feb 2019 13:46:48 +0000 (13:46 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 28 Feb 2019 13:46:48 +0000 (13:46 +0000)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/project/Jalview2XML.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge