Merge branch 'features/JAL-2349_matrixvis' into merge/develop_JAL-2340_matrixvis
authorJim Procter <jprocter@issues.jalview.org>
Tue, 18 Jun 2019 09:19:49 +0000 (10:19 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 18 Jun 2019 10:31:12 +0000 (11:31 +0100)
commitf14071cd4c32feeacdb6d4638ef4e3b52071f2f3
treeb5128e13543aa99c80736180eb127ca089573c9f
parent63f0dcf0574ae6652c5f8f2bbf7750acef5baf00
parentec141f1e76995494a4caf9fb8a55809d654ab423
Merge branch 'features/JAL-2349_matrixvis' into merge/develop_JAL-2340_matrixvis

 Conflicts:
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentI.java
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/AnnotationPanel.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/AlignmentI.java
src/jalview/gui/AnnotationPanel.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/renderer/ContactMapRenderer.java
src/jalview/viewmodel/AlignmentViewport.java