From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 25 Nov 2014 17:43:48 +0000 (+0000)
Subject: merge commit
X-Git-Tag: Jalview_2_9~146^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8810711642d8473325c8a3d3e76cc5c3c9b5bbd;p=jalview.git

merge commit
---

b8810711642d8473325c8a3d3e76cc5c3c9b5bbd
diff --cc .classpath
index c1c9708,38d2106..5ec60c0
--- a/.classpath
+++ b/.classpath
@@@ -48,7 -48,10 +48,10 @@@
  	<classpathentry kind="lib" path="lib/log4j-to-slf4j-2.0-rc2.jar"/>
  	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
  	<classpathentry kind="lib" path="lib/VARNAv3-91.jar"/>
++
+ 	<classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
  	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 -	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin17"/>
  	<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"/>