Merge branch 'develop' of https://source.jalview.org/git/jalview.git

into develop

Conflicts:
	lib/xercesImpl.jar

diff --git a/.classpath b/.classpath
index 8ba0e34..6583992 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,7 @@
        <classpathentry kind="lib" path="lib/regex.jar"/>
        <classpathentry kind="lib" path="lib/saaj.jar"/>
        <classpathentry kind="lib" path="lib/wsdl4j.jar"/>
+       <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
        <classpathentry kind="lib" path="lib/castor-1.1-cycle-xml.jar" sourcepath="C:/Documents and Settings/JimP/workspace-3.3/castor/src/main/java"/>
        <classpathentry kind="lib" path="lib/JGoogleAnalytics_0.3.jar" sourcepath="/JGoogleAnalytics/src/main/java"/>
        <classpathentry kind="lib" path="lib/vamsas-client.jar"/>
@@ -68,6 +69,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.6-indy.jar"/>
-       <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
        <classpathentry kind="output" path="classes"/>
 </classpath>