From: Jim Procter Date: Thu, 15 Oct 2015 13:01:01 +0000 (+0100) Subject: Merge branch 'bug/JAL-1923_290b2_group_annots' into Release_2_9_0b1_Branch X-Git-Tag: Release_2_9_0b2~4 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=34a685e3f7f8eab7a6f5b2b93a9ff199172d38a4;hp=48d771634c20c172ba99d675a2f8277ccc252333;p=jalview.git Merge branch 'bug/JAL-1923_290b2_group_annots' into Release_2_9_0b1_Branch --- diff --git a/build.xml b/build.xml index e1ca55f..d429d3c 100755 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@