Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 11 Mar 2015 11:27:44 +0000 (11:27 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 11 Mar 2015 11:27:44 +0000 (11:27 +0000)
commitba2f5105391c4421c9d74e5f63505e2a291035b0
tree8731ad2dd6a702fbee90640c75aac7212aa2e383
parentb04bbad58a8dd34fe773dfeb758e71e64606ed9e
parent6e514532a128c47d099985375d6126111ef548cb
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
19 files changed:
examples-jbake/templates/jvl_examples.ftl
examples/applets.html
src/jalview/analysis/AAFrequency.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/StructureFrequency.java
src/jalview/api/AlignViewportI.java
src/jalview/datamodel/AlignedCodonFrame.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/schemes/ResidueProperties.java
src/jalview/util/Format.java
src/jalview/util/QuickSort.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/AlignCalcManager.java
src/jalview/workers/ConsensusThread.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/schemes/DnaCodonTests.java