Merge branch 'features/JAL-2068groovyAnnotationWorker' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 18 Jul 2016 13:01:49 +0000 (14:01 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 18 Jul 2016 13:01:49 +0000 (14:01 +0100)
commitc956ba7509e394cf70dbf049abe5fbc967222144
tree86965524f9f85ebf160395498fb1b9db39b5c629
parent8cc3de5e7d587045f6d8e907ab9c630afb625d99
parent408b2821c8daf99245bf6358d06760701d90ddd8
Merge branch 'features/JAL-2068groovyAnnotationWorker' into develop
minor conflicts in constructor/imports for unification of Graduated/FeatureColour
src/jalview/appletgui/FeatureRenderer.java
src/jalview/gui/FeatureRenderer.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/workers/StrucConsensusThread.java