From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 26 Jan 2017 09:47:42 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2379pcaMemory
X-Git-Tag: Release_2_10_3b1~343^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0ce9577d119e1cc646f4b0d2e961f698d994fcc5;hp=0ce9577d119e1cc646f4b0d2e961f698d994fcc5;p=jalview.git

Merge branch 'develop' into features/JAL-2379pcaMemory

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