Merge branch 'develop' into refactor/JAL-2106_sourceDbRef_revision

author Jim Procter <jprocter@issues.jalview.org>

Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)

committer Jim Procter <jprocter@issues.jalview.org>

Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)
author Jim Procter <jprocter@issues.jalview.org>
Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)
committer Jim Procter <jprocter@issues.jalview.org>
Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)
diff --cc src/jalview/analysis/AlignmentUtils.java
Simple merge
diff --cc src/jalview/datamodel/xdb/embl/EmblEntry.java
Simple merge
diff --cc test/jalview/analysis/AlignmentUtilsTests.java
Simple merge
diff --cc test/jalview/datamodel/SequenceTest.java
Simple merge
author	Jim Procter <jprocter@issues.jalview.org>
	Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)
committer	Jim Procter <jprocter@issues.jalview.org>
	Thu, 25 Aug 2016 09:54:04 +0000 (10:54 +0100)
		1	2
src/jalview/analysis/AlignmentUtils.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/xdb/embl/EmblEntry.java	patch \|	diff1 \|	diff2 \|	blob \| history
test/jalview/analysis/AlignmentUtilsTests.java	patch \|	diff1 \|	diff2 \|	blob \| history
test/jalview/datamodel/SequenceTest.java	patch \|	diff1 \|	diff2 \|	blob \| history