git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 940b2a9 eb5043c)
Merge branch 'bug/JAL-2323disulfideOverview' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 14:02:19 +0000 (14:02 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 14:02:19 +0000 (14:02 +0000)
1  2 
src/jalview/controller/AlignViewController.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
test/jalview/controller/AlignViewControllerTest.java patch | diff1 | diff2 | blob | history

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