From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 7 Sep 2017 13:19:03 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_2b1_Branch' of http://source.jalview.org/git... 
X-Git-Tag: Release_2_10_2b1^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6af8a1bf63beb54937489a0298eaef5c72bf8c60;hp=-c;p=jalview.git

Merge branch 'releases/Release_2_10_2b1_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_2b1_Branch
---

6af8a1bf63beb54937489a0298eaef5c72bf8c60
diff --combined help/html/releases.html
index b44e5cb,830df62..5afe85c
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@@ -71,7 -71,7 +71,7 @@@ li:before 
        <td width="60" nowrap>
          <div align="center">
            <strong><a name="Jalview.2.10.2b1">2.10.2b1</a><br />
-             <em>6/9/2017</em></strong>
+             <em>7/9/2017</em></strong>
          </div>
        </td>
        <td><div align="left">
@@@ -140,11 -140,6 +140,11 @@@
                <!-- JAL-2724 -->Cannot apply annotation based
                colourscheme to all groups in a view
              </li>
 +            <li>
 +              <!-- JAL-2511 -->IDs don't line up with sequences
 +              initially after font size change using the Font chooser or
 +              middle-mouse zoom
 +            </li>
            </ul>
          </div></td>