From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 10 Apr 2012 07:48:29 +0000 (+0100)
Subject: Merge branch 'Tcoffee_JAL-1065' of https://source.jalview.org/git/jalview into test_p... 
X-Git-Tag: Archived_Release_2_7~4^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7a4781bea6b4b598a31c3abb9deebd415754eaec;p=jalview.git

Merge branch 'Tcoffee_JAL-1065' of https://source.jalview.org/git/jalview into test_paolo_JAL-1065
---

7a4781bea6b4b598a31c3abb9deebd415754eaec
diff --cc .classpath
index 01cf242,0c39740..cbb8f6b
--- a/.classpath
+++ b/.classpath
@@@ -39,7 -41,8 +41,9 @@@
  	<classpathentry kind="lib" path="lib/min-jaba-client.jar"/>
  	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
  	<classpathentry kind="lib" path="lib/Jmol-12.2.4.jar"/>
 +	<classpathentry kind="lib" path="appletlib/JmolApplet-12.2.4.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+ 	<classpathentry kind="lib" path="appletlib/JmolApplet-12.2.4.jar"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>