Merge branch 'develop' into bug/JAL-98consensusMemory
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:55:50 +0000 (13:55 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:55:50 +0000 (13:55 +0100)
commitb7c6fbe6d47b510f7ac845eb5c29e971ffb41cfb
tree4d86db40716079502630eb80ebd745f5fee6aa04
parent0b221815cba124b1ed7bc3c94c38a4dcf867894a
parent1eda02547f8519e1dff46dac06734cba6c77b97f
Merge branch 'develop' into bug/JAL-98consensusMemory
src/jalview/analysis/Conservation.java
src/jalview/api/AlignViewportI.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/viewmodel/AlignmentViewport.java