Merge branch 'develop' into features/JAL-2379pcaMemory
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Jan 2017 09:47:42 +0000 (09:47 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 26 Jan 2017 09:47:42 +0000 (09:47 +0000)
Conflicts:
src/jalview/analysis/PCA.java
src/jalview/math/Matrix.java
test/jalview/math/MatrixTest.java


No differences found