source.jalview.org Git - jalview.git/commit

git://source.jalview.org / jalview.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c650abb 29c183b)

author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Tue, 21 Feb 2017 11:56:39 +0000 (11:56 +0000)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Tue, 21 Feb 2017 11:56:39 +0000 (11:56 +0000)
commit	f46c404585087d8937c48504bfcff716440d5186
tree	744c584e3964a9c1e25cdeba03904c7d26cf9ab8	tree \| snapshot
parent	c650abb5e4572557e1d175ecc72a0f7c8892202e	commit \| diff
parent	29c183b0d0de9f6f9f94d2b528d10e20b1891684	commit \| diff

Merge branch 'develop' into features/JAL-2393customMatrices

Conflicts:
src/jalview/analysis/PCA.java
src/jalview/schemes/ResidueProperties.java
src/jalview/schemes/ScoreMatrix.java

src/jalview/analysis/PCA.java	diff1 \|	diff2 \|	blob \| history
src/jalview/analysis/scoremodels/ScoreMatrix.java	diff1 \|	\|	blob \| history
src/jalview/datamodel/BinarySequence.java	diff1 \|	diff2 \|	blob \| history
src/jalview/viewmodel/PCAModel.java	diff1 \|	diff2 \|	blob \| history
test/jalview/analysis/scoremodels/ScoreMatrixTest.java	diff1 \|	\|	blob \| history
test/jalview/analysis/scoremodels/ScoreModelsTest.java	diff1 \|	\|	blob \| history
test/jalview/schemes/ScoreMatrixPrinter.java	blob1 \|	blob2 \|	history