Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 22 Mar 2017 16:46:57 +0000 (16:46 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 22 Mar 2017 16:46:57 +0000 (16:46 +0000)
commit2642dbd0c2c9515c66da193ebcebf72bc82a54d3
tree4cfa8cc9ae81ae6161101bb860f738e358b2eaba
parenta8a60500f1be9c3e02976f2193eb62ff5a302220
parent550949340ef5ccd5757dd50b11b9613d61571046
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/gui/SeqCanvas.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/gui/OverviewPanel.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java