Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sun, 23 Jul 2017 07:59:37 +0000 (08:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sun, 23 Jul 2017 07:59:37 +0000 (08:59 +0100)
commitfb2d7072a283815141262d70d5f11a5e966d500b
tree5a2f5f1b29905b45bf7e63aeea399e481a227ece
parentc4b90e7ff57436d6bb96d316eed24c887b241f4d
parente584930ae4941e8508c9073c6f08eb484a914bdf
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/api/FeatureColourI.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/schemes/FeatureColour.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
test/jalview/schemes/FeatureColourTest.java