From: Jim Procter Date: Mon, 24 Oct 2016 21:23:29 +0000 (+0100) Subject: Merge branch 'sourcepub' into releases/Release_2_10_0_Branch X-Git-Tag: Release_2_10_0b1_sourcepub^2~1 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d0d9438f00d2ad44a9d5711922157d2746d44c00;hp=4dc7619bed1c475c35f328601b5d7d46116327a6;p=jalview.git Merge branch 'sourcepub' into releases/Release_2_10_0_Branch --- diff --git a/build.xml b/build.xml index d8f12e0..7235950 100755 --- a/build.xml +++ b/build.xml @@ -697,8 +697,9 @@ - - + + + @@ -729,8 +730,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +