Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 8 May 2017 16:01:31 +0000 (17:01 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 8 May 2017 16:01:31 +0000 (17:01 +0100)
commita42904684c75b2729d763af933e5a991a3424f67
tree64463c00a8d2144e9394f6a0fa9da0257bb42953
parentc28dc7d17e5f61210c70217996f9153458f07de0
parent0019a53f8a0a4cfbff3e9508dc5f34aaeffe637a
Merge branch 'develop' into features/JAL-2446NCList

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