From: Jim Procter Date: Wed, 3 Dec 2014 07:48:02 +0000 (+0000) Subject: Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch X-Git-Tag: Release_2_8_2~1^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bdf523fe1f6a27bc6d15dd697fa81d491f2e622f;hp=86cec38848a32ac7897bb4d1a4dac025021b3180;p=jalview.git Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch --- diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS index 386541e..ea44193 100644 --- 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 --- a/help/html/releases.html +++ b/help/html/releases.html @@ -44,7 +44,7 @@
- 2.8.2
2/12/2014 + 2.8.2
3/12/2014
General