From: jprocter Date: Fri, 17 Jan 2014 16:39:47 +0000 (+0000) Subject: Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch X-Git-Tag: Release_2_8_0b1~1^2~17 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c9a0bad2deba88c000b71565be443554c5093e87;hp=46b4ea6d1ccc1a6adc9504b16859a61959d9eb96;p=jalview.git Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch --- diff --git a/build.xml b/build.xml index f2a9daf..5a0ba13 100755 --- a/build.xml +++ b/build.xml @@ -622,7 +622,7 @@ Preserves Pre-Java 1.7_u45 behavior once 'permissions' parameter added to applet tag --> - + @@ -642,7 +642,7 @@ --> - + @@ -654,7 +654,7 @@ - +