git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b911af f5d913e)
Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:00:31 +0000 (14:00 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:00:31 +0000 (14:00 +0100)
1  2 
src/jalview/appletgui/SeqCanvas.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqCanvas.java patch | diff1 | diff2 | blob | history

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