git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a546918 ddae5cd)
Merge branch 'bug/JAL-247pngShowHiddenSeqMarks' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Aug 2018 15:30:32 +0000 (16:30 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Aug 2018 15:30:32 +0000 (16:30 +0100)
1  2 
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqCanvas.java patch | diff1 | diff2 | blob | history

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