git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: f46c404)
Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Feb 2017 11:56:39 +0000 (11:56 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Feb 2017 11:56:39 +0000 (11:56 +0000)
Conflicts:
src/jalview/analysis/PCA.java
src/jalview/schemes/ResidueProperties.java
src/jalview/schemes/ScoreMatrix.java


No differences found