Merge remote-tracking branch 'origin/develop' into
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 12:36:24 +0000 (12:36 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 12:36:24 +0000 (12:36 +0000)
commit6e5286721b2711415a80d34364ae24b7a81fe2f9
treed67cd853ebf6f5c7a9b9470b85d10044e1acbde9
parent6a9ee61dcddf37da47e1f05b544b69587d2b3e7f
parent32f013e4de40a95ac786d49a30e802a00bb8f1ba
Merge remote-tracking branch 'origin/develop' into
bug/JAL-2436featureRendererThreading

Conflicts:
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/SeqCanvas.java