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)
commit0ce9577d119e1cc646f4b0d2e961f698d994fcc5
tree64ff41463b04a15a818efd7fbb60ead175277cf7
parent80ff57c095b792b8e8e123ddb0eff4d1780d6cbd
parentc8b35bed08a4bd8688b762bd50f13195c1cfb1c6
Merge branch 'develop' into features/JAL-2379pcaMemory

Conflicts:
src/jalview/analysis/PCA.java
src/jalview/math/Matrix.java
test/jalview/math/MatrixTest.java
src/jalview/analysis/PCA.java
src/jalview/math/Matrix.java
test/jalview/math/MatrixTest.java