git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3997675 92dc8d4)
Merge remote-tracking branch 'origin/feature/JAL-3141_backupfiles_for211' into merge...
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Feb 2019 14:15:43 +0000 (14:15 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Feb 2019 14:15:43 +0000 (14:15 +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