From: tcofoegbu Date: Fri, 27 Mar 2015 11:37:34 +0000 (+0000) Subject: merge commit X-Git-Tag: Jalview_2_9~71^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c77a1af8ef91918f935bbf493d348eb022fa73f7;hp=a624bae1db1ec7edde062bacfe3890c1e018209f;p=jalview.git merge commit --- diff --git a/.classpath b/.classpath index 832b6d6..6dfc1d6 100644 --- a/.classpath +++ b/.classpath @@ -51,7 +51,7 @@ - + diff --git a/README b/README index 10f032b..cbc93b1 100755 --- a/README +++ b/README @@ -4,7 +4,7 @@ Jalview Readme The source is available as a tar file and comes complete with the GNU General Public License. -To build the application you will need a J2SDK 1.6+. +To build the application you will need a J2SDK 1.7+. An Ant build file (build.xml) is provided, you will need to install Apache Ant first. Run ant to view usage which will display a list of useful build targets. diff --git a/RELEASE b/RELEASE index 11598ab..433e646 100644 --- a/RELEASE +++ b/RELEASE @@ -1,2 +1,2 @@ -jalview.release=Release_2_8_2_Branch -jalview.version=2.8.2 +jalview.release=Release_2_8_3_Branch +jalview.version=2.8.3 diff --git a/build.xml b/build.xml index 478e936..49fd37e 100755 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + diff --git a/doc/AddingGroovySupport.html b/doc/AddingGroovySupport.html index 0cb58c6..41e34ce 100644 --- a/doc/AddingGroovySupport.html +++ b/doc/AddingGroovySupport.html @@ -1,7 +1,7 @@ diff --git a/examples/css/ie6.css b/examples/css/ie6.css index 11c7f65..2a70fa1 100644 --- a/examples/css/ie6.css +++ b/examples/css/ie6.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/ie7.css b/examples/css/ie7.css index 27a3f0d..47ba859 100644 --- a/examples/css/ie7.css +++ b/examples/css/ie7.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/reset.css b/examples/css/reset.css index 71df1ed..de3e422 100644 --- a/examples/css/reset.css +++ b/examples/css/reset.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/style.css b/examples/css/style.css index 61a39e9..3184fde 100644 --- a/examples/css/style.css +++ b/examples/css/style.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/embedded.html b/examples/embedded.html index a14dd75..ce17f7d 100644 --- a/examples/embedded.html +++ b/examples/embedded.html @@ -1,7 +1,7 @@