Merge remote-tracking branch 'origin/develop' into
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 14:47:23 +0000 (14:47 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 14:47:23 +0000 (14:47 +0000)
commit299d350019dc2701cd2d9812e8ce1285146bc045
tree55992167fde53025add4de1deddb046de228219b
parent0a2de5e40c8a65c535374f965e0f568b2f41fc17
parent550949340ef5ccd5757dd50b11b9613d61571046
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388OverviewWindow

Conflicts:
src/jalview/gui/OverviewPanel.java
src/jalview/gui/OverviewCanvas.java
src/jalview/gui/OverviewPanel.java
src/jalview/viewmodel/AlignmentViewport.java