JAL-2505 updates after conflicting merge of JAL-2504
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 15:40:14 +0000 (16:40 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 15:40:14 +0000 (16:40 +0100)
commit56d68286221ccea4f894ef480df4173a880152b2
treea62cb383d18fe84bb3bb206de99fa12d17be6fb7
parent2841011ed9f4fc86dbe06ae7ae9809b087cd2cce
JAL-2505 updates after conflicting merge of JAL-2504
src/jalview/appletgui/FeatureRenderer.java
src/jalview/gui/FeatureRenderer.java