Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch

diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS
index 386541e..ea44193 100644 (file)
--- a/THIRDPARTYLIBS
+++ b/THIRDPARTYLIBS
@@ -11,6 +11,7 @@ Licencing information for each library is given below:
 
 JGoogleAnalytics_0.3.jar       APL 2.0 License - http://code.google.com/p/jgoogleanalytics/
 Jmol-12.1.13.jar       GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/
+VARNAv3-91.jar GPL licenced software by Kévin Darty, Alain Denise and Yann Ponty. http://varna.lri.fr
 activation.jar 
 apache-mime4j-0.6.jar
 axis.jar
@@ -39,6 +40,7 @@ wsdl4j.jar
 xercesImpl.jar
 xml-apis.jar
 json_simple-1.1.jar : Apache 2.0 license : downloaded from https://code.google.com/p/json-simple/downloads/list (will move to 1.1.1 version when jalview is mavenised and osgi-ised)
+jfreesvg-2.1.jar : GPL v3 licensed library from the JFree suite: http://www.jfree.org/jfreesvg/
 
 Additional dependencies
 

diff --git a/help/html/releases.html b/help/html/releases.html
index e8e6ee7..92a39cb 100755 (executable)
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -44,7 +44,7 @@
                </tr>
                <tr>
                        <td><div align="center">
-                                       <strong><a name="Jalview.2.8.2">2.8.2</a><br /> <em>2/12/2014</em></strong>
+                                       <strong><a name="Jalview.2.8.2">2.8.2</a><br /> <em>3/12/2014</em></strong>
                                </div></td>
                        <td><em>General</em>
                                <ul>
@@ -118,7 +118,7 @@
                                        <li>Cannot open sequence feature shading/sort popup menu in
                                                feature settings dialog</li>
                                        <li>better tooltip placement for some areas of Jalview desktop</li>
-                                       <li>Unable to add JABAWS Server which doesn&#39;t pass
+                                       <li>Allow addition of JABAWS Server which doesn&#39;t pass
                                                validation</li>
                                        <li>Web services parameters dialog box is too large to fit on
                                                screen</li>