From: Jim Procter <jprocter@issues.jalview.org>
Date: Sun, 3 Sep 2017 11:26:58 +0000 (+0100)
Subject: Merge branch 'feature/JAL-2527' into documentation/JAL-2675_release2102b1
X-Git-Tag: Release_2_10_3b1~142^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=72cf0003490f887c3bc8fe0dfea8ac9d48c53eed;p=jalview.git

Merge branch 'feature/JAL-2527' into documentation/JAL-2675_release2102b1
---

72cf0003490f887c3bc8fe0dfea8ac9d48c53eed
diff --cc help/html/releases.html
index 3ff32f9,8f5a024..9cae363
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@@ -83,9 -88,13 +88,16 @@@ li:before 
            <em></em>
            <ul>
              <li>
 -              <!-- JAL-2603 -->Overview window throws NPE if show boxes
 +              <!-- JAL-2681 -->duplicate protein sequences shown after
 +              retreiving Ensembl crossrefs for sequences from Uniprot
 +            </li>
++            <li>  <!-- JAL-2603 -->Overview window throws NPE if show boxes
+               format setting is unticked
+             </li>
+             <li>
+               <!-- JAL-2610 -->Groups are coloured wrongly in overview
+               if group has show boxes format setting unticked
+             </li>
            </ul>
          </div></td>
      
diff --cc help/html/whatsNew.html
index c002eb8,92ad73f..169e7fe
--- a/help/html/whatsNew.html
+++ b/help/html/whatsNew.html
@@@ -28,8 -28,11 +28,11 @@@
    </p>
    <p>
      This is patch release for 2.10.2. See the <a
 -      href="releases.html#Jalview2.10.2b1">release notes</a>.
 +      href="releases.html#Jalview.2.10.2b1">release notes</a>.
    </p>
+   <ul>
+     <li>Gaps are now rendered as dark grey in overview window</li>
+   </ul>
    <p>
      <strong>What's new in Jalview 2.10.2 ?</strong>
    </p>