From: Jim Procter <jprocter@dundee.ac.uk>
Date: Tue, 2 Dec 2014 18:02:19 +0000 (+0000)
Subject: Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2~1^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=86cec38848a32ac7897bb4d1a4dac025021b3180;hp=5893c4925975c697f345f37c27e53b149c0ab6ac;p=jalview.git

Merge branch 'JAL-1517_release282' into Release_2_8_2_Branch
---

diff --git a/help/html/releases.html b/help/html/releases.html
index 38a92ad..e8e6ee7 100755
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -71,7 +71,7 @@
 					<li>Structure viewer preferences tab</li>
 					<li>Disorder and Secondary Structure annotation tracks shared
 						between alignments</li>
-					<li>UCSF launch and linked highlighting from Jalview</li>
+					<li>UCSF Chimera launch and linked highlighting from Jalview</li>
 					<li>Show/hide all sequence associated annotation rows for all
 						or current selection</li>
 					<li>disorder and secondary structure predictions available as