Merge branch 'releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 11:41:08 +0000 (12:41 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 18 Apr 2018 11:41:08 +0000 (12:41 +0100)
commit77b160b053c41a5d5c95bf1bbc0fbd066435f70d
tree79043aef28f76462b8b7b6a548c099ebd146de55
parenta6290d3f52e62863d93ca5b5c5b0739fc6143d4c
parentb7cb4c78d9d787e918c9d88f917a41642dd90a7a
Merge branch 'releases/Release_2_10_4_Branch' into develop

Conflicts:
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/renderer/seqfeatures/FeatureRendererTest.java
src/jalview/appletgui/OverviewCanvas.java
src/jalview/gui/OverviewCanvas.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/renderer/seqfeatures/FeatureRendererTest.java