Merge remote-tracking branch 'origin/bug/JAL-3049colourCellTooltip' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 09:01:48 +0000 (09:01 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 09:01:48 +0000 (09:01 +0000)
commitee7d621eea4811c90ce8bc470cc1e217cd2d806c
treeaf5dae19bd931017e6cbc599c6a0f7e62a22f8da
parent7e00183505bd4c58d1ce62ee121ed372c3b058f2
parent8334a9d216c71bd0960ea01e2991c26382a139b7
Merge remote-tracking branch 'origin/bug/JAL-3049colourCellTooltip' into
merge/JAL-3049

Conflicts:
src/jalview/api/FeatureColourI.java
src/jalview/schemes/FeatureColour.java
test/jalview/schemes/FeatureColourTest.java
src/jalview/api/FeatureColourI.java
src/jalview/gui/FeatureSettings.java
src/jalview/schemes/FeatureColour.java
test/jalview/gui/FeatureSettingsTest.java
test/jalview/schemes/FeatureColourTest.java