From: Jim Procter Date: Fri, 6 Mar 2015 15:40:33 +0000 (+0000) Subject: Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e309b8d9bd62fb304fdd612c7385e76027d2f2d7;hp=286715d8408510556366a454a748daf8f60444f1;p=jalview.git Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop JAL-1645 bring JAL-845 feature branch up to date ready for develop merge Conflicts: src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java test/jalview/analysis/DnaTranslation.java --- 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..72e42f6 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_2b1_Branch +jalview.version=2.8.2b1 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 @@