Merge branch 'develop' into features/JAL-2068groovyAnnotationWorker features/JAL-2068groovyAnnotationWorker
authorJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 11:12:29 +0000 (12:12 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 11:12:29 +0000 (12:12 +0100)
commit408b2821c8daf99245bf6358d06760701d90ddd8
treee96b805fd39ffa2d6b672d3c0ebff8fbc9e41328
parentf8e603128476ca6e093ea2fc65435d1294978c53
parent5fec3766a492c59beafb74aca7272a90a7516130
Merge branch 'develop' into features/JAL-2068groovyAnnotationWorker
fun fact: Jalview.getCurrentAlignFrame() should be used in place of Desktop.getCurrentAlignFrame() now
src/jalview/appletgui/FeatureRenderer.java
src/jalview/gui/AnnotationLabels.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/workers/AlignmentAnnotationFactory.java