From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 3 Oct 2017 14:25:34 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_2b1_Branch' into develop
X-Git-Tag: Release_2_10_3b1~119
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3ac6f45c254aaafa6bdf163bf66bb4031de21fa3;p=jalview.git

Merge branch 'releases/Release_2_10_2b1_Branch' into develop

 Conflicts:
	help/html/releases.html
	help/html/whatsNew.html
	src/jalview/ws/dbsources/Uniprot.java
---

3ac6f45c254aaafa6bdf163bf66bb4031de21fa3
diff --cc help/html/releases.html
index 1b8ca87,4be594a..8e55ca1
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@@ -75,21 -75,23 +75,41 @@@ li:before 
          </div>
        </td>
        <td><div align="left">
 -          <em>New features in Jalview Desktop</em>
 +          <em></em>
            <ul>
              <li>
 -              <!-- JAL-2748 -->Uniprot Sequence Fetcher now uses web API at uniprot.org 
 -              <!-- JAL-2745 -->HTTPS used for all connections to ebi.ac.uk 
 +              <!-- JAL-2446 -->Faster and more efficient management and
 +              rendering of sequence features
              </li>
 -
            </ul>
--        </div></td>
++      </td>
        <td><div align="left">
            <em></em>
            <ul>
 +            <li><!-- JAL-2728 -->Protein annotation panel too high in CDS/Protein view
++            </li> 
++          </ul>
++      </td>
++    </tr>
++    <tr>
++      <td width="60" nowrap>
++        <div align="center">
++          <strong><a name="Jalview.2.10.2b2">2.10.2b2</a><br />
++            <em>2/10/2017</em></strong>
++        </div>
++      </td>
++      <td><div align="left">
++          <em>New features in Jalview Desktop</em>
++          <ul>
+             <li>
 -              <!--  -->
++              <!-- JAL-2748 -->Uniprot Sequence Fetcher now uses web API at uniprot.org 
++            </li>
++            <li>  <!-- JAL-2745 -->HTTPS used for all connections to ebi.ac.uk 
              </li>
            </ul>
          </div></td>
++      <td><div align="left">
++        </div></td>
      </tr>
      <tr>
        <td width="60" nowrap>