Merge branch 'feature/JAL-1333' into features/JAL-1333

Conflicts:
	.classpath

diff --git a/.classpath b/.classpath
index dd90b49..36a4c97 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -48,6 +48,7 @@
        <classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
        <classpathentry kind="lib" path="lib/VARNAv3-9.jar" sourcepath="/Users/jimp/Documents/Jalview/VARNA/VARNAv3-9-src.jar"/>
        <classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
+       <classpathentry kind="lib" path="lib/structureViz2-0.9.0.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="output" path="classes"/>