From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 5 Feb 2015 17:10:39 +0000 (+0000)
Subject: merge commit
X-Git-Tag: Jalview_2_9~98
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b2ca3639597b44f4bd3d225c3c8522b485993a0;p=jalview.git

merge commit
---

5b2ca3639597b44f4bd3d225c3c8522b485993a0
diff --cc .classpath
index 59772ae,1714959..a1fb44d
--- a/.classpath
+++ b/.classpath
@@@ -52,7 -51,9 +52,10 @@@
  	<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="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
 +	<classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
+ 	<classpathentry kind="lib" path="lib/quaqua-filechooser-only.jar"/>
++	
++	
  	<classpathentry kind="output" path="classes"/>
  </classpath>