From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Tue, 19 Dec 2017 10:52:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/kjvdh/features/PhylogenyViewerUserTest' into... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6eba4bf11053e3d85224e71ca7bc260a65397909;hp=-c;p=jalview.git

Merge remote-tracking branch 'origin/kjvdh/features/PhylogenyViewerUserTest' into kjvdh/features/testing
---

6eba4bf11053e3d85224e71ca7bc260a65397909
diff --combined .classpath
index fc617fa,0d114d8..a1d055e
--- a/.classpath
+++ b/.classpath
@@@ -49,10 -49,10 +49,9 @@@
  	<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="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"/>
 -	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugin.jar"/>
  	<classpathentry kind="lib" path="lib/jersey-client-1.19.jar"/>
  	<classpathentry kind="lib" path="lib/jersey-core-1.19.jar"/>
@@@ -69,5 -69,6 +68,5 @@@
  	<classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/groovy-all-2.4.12-indy.jar"/>
 -	<classpathentry combineaccessrules="false" kind="src" path="/forester"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>