From: tcofoegbu Date: Thu, 3 Sep 2015 08:48:07 +0000 (+0100) Subject: merge from develop X-Git-Tag: Release_2_10_0~475^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f06554784411ddbf871d642e66c8dcb7f147d4a8;p=jalview.git merge from develop --- f06554784411ddbf871d642e66c8dcb7f147d4a8 diff --cc examples/appletParameters.html index d6c4edd,c880a84..a0f25d4 --- a/examples/appletParameters.html +++ b/examples/appletParameters.html @@@ -456,4 -599,30 +456,4 @@@ the applet can be interacted with v (All the usual Jalview File formats are valid, however each new line in an alignment file must be entered as a parameter) - - - + - - - - - - - - -