From: Jim Procter <jprocter@Jims-MacBook-Pro-2.local>
Date: Tue, 1 Jul 2014 22:28:04 +0000 (-0700)
Subject: Merge branch 'feature/JAL-1333' into features/JAL-1333
X-Git-Tag: Jalview_2_9~179^2~20
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a94284081155efc1183fac5d8254826db542a933;p=jalview.git

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

Conflicts:
	.classpath
---

a94284081155efc1183fac5d8254826db542a933
diff --cc .classpath
index dd90b49,9173c59..36a4c97
--- a/.classpath
+++ b/.classpath
@@@ -44,11 -45,9 +44,12 @@@
  	<classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
  	<classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
  	<classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
 +	<classpathentry kind="lib" path="lib/groovy-all-1.8.2.jar"/>
 +	<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="lib" path="/Users/jimp/git/jalview_clean/lib/VARNAv3-9-dev.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>