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)
commite20cd4d53a73081a49b378f276aa17cd5d7948fb
treec4f5b3b85b670528c701e9d93b430ee219be25b5
parentaa6643d51133a8541dcbe30191b344aa09907a5f
parent2a1dbdc270539ca23fb27f6998f48d9ecc84a144
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
src/jalview/api/AlignViewportI.java
src/jalview/viewmodel/AlignmentViewport.java