Merge remote-tracking branch bug/JAL-2436featureRendererThreading
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 13:53:57 +0000 (13:53 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 22 Mar 2017 13:53:57 +0000 (13:53 +0000)
commitef0a35a8dff8c0cc6ffa634c2b01cdca61f74b3d
treed67cd853ebf6f5c7a9b9470b85d10044e1acbde9
parent6e5286721b2711415a80d34364ae24b7a81fe2f9
parent9d40dad63906695a693c749f9c95377491eb71bd
Merge remote-tracking branch
'origin/bug/JAL-2436featureRendererThreading' into develop

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