git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf18277 8f73724)
Merge branch 'develop' into feature/JAL-3364splitFrameImage
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jul 2019 10:49:20 +0000 (11:49 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jul 2019 10:49:20 +0000 (11:49 +0100)
1  2 
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
src/jalview/gui/IdCanvas.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc src/jalview/gui/IdCanvas.java
Simple merge