git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92392d9 2a5bc21)
Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
authorJim Procter <jprocter@issues.jalview.org>
Tue, 19 Jul 2016 10:20:03 +0000 (11:20 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 19 Jul 2016 10:20:03 +0000 (11:20 +0100)
1  2 
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/OverviewPanel.java patch | diff1 | diff2 | blob | history
src/jalview/appletgui/SeqPanel.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceGroup.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SeqPanel.java patch | diff1 | diff2 | blob | history
src/jalview/gui/SequenceRenderer.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/SeqPanel.java
Simple merge
diff --cc src/jalview/gui/SequenceRenderer.java
Simple merge