Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 14:55:53 +0000 (15:55 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 22 May 2017 14:55:53 +0000 (15:55 +0100)
commit2841011ed9f4fc86dbe06ae7ae9809b087cd2cce
treee34cc6bed9b9917297e04e1221e5caeb400fcc52
parent691e7f3e04f4ddc3ae858257f063a0b01be265fc
parentcd126a7085c5ebcfc8c05378c71bd862abc4fd91
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/FeatureRenderer.java