git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa6643d 2a1dbdc)
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 9 Feb 2017 15:30:02 +0000 (15:30 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 9 Feb 2017 15:30:02 +0000 (15:30 +0000)
1  2 
src/jalview/api/AlignViewportI.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/api/AlignViewportI.java
Simple merge