From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 21 Mar 2018 16:35:39 +0000 (+0000)
Subject: Merge branch 'releases/Release_2_10_4_Branch' into develop
X-Git-Tag: Release_2_11_0~49
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e4843176d8337fc165c1b93ae6c161cb29521f6d;p=jalview.git

Merge branch 'releases/Release_2_10_4_Branch' into develop
---

e4843176d8337fc165c1b93ae6c161cb29521f6d
diff --cc .classpath
index c85feaf,9a0a468..17523b9
--- a/.classpath
+++ b/.classpath
@@@ -66,8 -67,7 +66,9 @@@
  	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
  	<classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
 +	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 +	<classpathentry kind="lib" path="lib/htsjdk-2.12.0.jar"/>
  	<classpathentry kind="lib" path="lib/groovy-all-2.4.12-indy.jar"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>