Merge branch 'develop' into spike/matrix_annot
authorJim Procter <jprocter@issues.jalview.org>
Fri, 10 Feb 2017 18:46:15 +0000 (18:46 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 10 Feb 2017 18:46:15 +0000 (18:46 +0000)
commitc007d50b16da69f9a0bab23f8a1afd7347fc7e87
treede79ed12b5d8cf4ce5c12b927872cdb128ec0265
parent84233f5cfbe9907cbd390db92db8e267de1a02e3
parentc00cfcb9f2223f1225fba57e5de85141cfa4570c
Merge branch 'develop' into spike/matrix_annot
src/jalview/api/AlignViewportI.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentI.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/viewmodel/AlignmentViewport.java