git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a7569b f1f528a)
Merge branch 'bug/JAL-3158selectionBroadcasts' into merge/JAL-3158
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 10:57:17 +0000 (10:57 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 10:57:17 +0000 (10:57 +0000)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/ScalePanel.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/ScalePanel.java
Simple merge