From: Jim Procter Date: Mon, 25 Nov 2013 16:44:17 +0000 (+0000) Subject: Merge branch 'JAL-1139_proguard' into Release_2_8_Branch X-Git-Tag: Release_2_8_0b1~1^2~30 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f8661272f34442d8ade497c0fc495efb1ddce713;hp=270f99f51c90e60f050a64f3d44ba44c7eb1436d;p=jalview.git Merge branch 'JAL-1139_proguard' into Release_2_8_Branch --- diff --git a/build.xml b/build.xml index 5816100..eae1d94 100755 --- a/build.xml +++ b/build.xml @@ -228,7 +228,7 @@ - +