Clone
gmungoc <g.m.carstairs@dundee.ac.uk>
committed
5 years and 2 months ago
Merge branch 'develop' into features/JAL-2393customMatrices
Conflicts:
src/jalview/analysis/PCA.java
src/jalview/schemes/ResidueProperties… Show more
Merge branch 'develop' into features/JAL-2393customMatrices

Conflicts:

        src/jalview/analysis/PCA.java

        src/jalview/schemes/ResidueProperties.java

        src/jalview/schemes/ScoreMatrix.java

Show less

master + 491 more