git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 734d0e7 13fd7bc)
Merge branch 'develop' into bug/JAL-2431splitFrameNewView bug/JAL-2431splitFrameNewView
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 31 Mar 2017 09:59:57 +0000 (10:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 31 Mar 2017 09:59:57 +0000 (10:59 +0100)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

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