From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 7 May 2018 13:59:27 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_4_Branch' into develop
X-Git-Tag: Release_2_11_0~42
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9f1f7839cfd50555efd3af1ff4102348f950c563;p=jalview.git

Merge branch 'releases/Release_2_10_4_Branch' into develop

Conflicts:
	.classpath
---

9f1f7839cfd50555efd3af1ff4102348f950c563
diff --cc .classpath
index f4b8cf8,3a05b47..0cdc4b9
--- a/.classpath
+++ b/.classpath
@@@ -48,6 -48,8 +48,7 @@@
  	<classpathentry kind="lib" path="lib/VARNAv3-93.jar"/>
  	<classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
  	<classpathentry kind="lib" path="lib/quaqua-filechooser-only-8.0.jar"/>
 -	<classpathentry kind="lib" path="lib/htsjdk-1.133.jar"/>
+ 	<classpathentry kind="lib" path="lib/VAqua4.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
  	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>