git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d9c7868 59d9262)
Merge branch 'releases/Release_2_10_0_Branch'
authorJim Procter <jprocter@issues.jalview.org>
Tue, 25 Oct 2016 10:46:04 +0000 (11:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 25 Oct 2016 10:46:04 +0000 (11:46 +0100)
1  2 
help/help.jhm patch | diff1 | diff2 | blob | history
help/html/whatsNew.html patch | diff1 | diff2 | blob | history

diff --combined help/help.jhm
index 56fe004,407899e..5c16e2a
--- 1/help/help.jhm
--- 2/help/help.jhm
+++ b/help/help.jhm
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="ISO-8859-1" ?>
  <!--
 - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
 - * Copyright (C) $$Year-Rel$$ The Jalview Authors
 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
 + * Copyright (C) 2015 The Jalview Authors
   * 
   * This file is part of Jalview.
   * 
@@@ -22,7 -22,7 +22,7 @@@
     <mapID target="home" url="html/index.html" />
     
     <mapID target="new" url="html/whatsNew.html"/>
-    <mapID target="release" url="html/releases.html#Jalview.2.9"/>
+    <mapID target="release" url="html/releases.html#Jalview.2.10.0b1"/>
     <mapID target="alannotation" url="html/features/annotation.html"/>
     <mapID target="keys" url="html/keys.html"/>
     <mapID target="newkeys" url="html/features/newkeystrokes.html"/>
diff --combined help/html/whatsNew.html
index 7aad0ba,448430d..1242419
--- 1/help/html/whatsNew.html
--- 2/help/html/whatsNew.html
+++ b/help/html/whatsNew.html
@@@ -1,7 -1,7 +1,7 @@@
  <html>
  <!--
 - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
 - * Copyright (C) $$Year-Rel$$ The Jalview Authors
 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
 + * Copyright (C) 2015 The Jalview Authors
   * 
   * This file is part of Jalview.
   * 
@@@ -24,14 -24,23 +24,23 @@@
  </head>
  <body>
    <p>
-     <strong>What's new in Jalview 2.10 ?</strong>
+     <strong>What's new in Jalview 2.10.0b1 ?</strong>
    </p>
    <p>
-     Jalview 2.10 is the next major release in the Jalview 2 series. Full
-     details are in the <a href="releases.html#Jalview.2.10.0">Jalview
-       2.10 Release Notes</a>, but the highlights are below.
+     Jalview 2.10.0b1 is a patch release for 2.10, the next major release
+     in the Jalview 2 series. Full details are in the <a
+       href="releases.html#Jalview.2.10.0b1">Jalview 2.10b1 Release
+       Notes</a>, but the highlights are below.
    </p>
    <ul>
+     <li>Drag and drop reinstated for the Jalview desktop on
+       Windows, Linux and older OSX systems.</li>
+     <li>Problems loading local PDB files have been fixed</li>
+     <li>Conservation shading can be disabled for PID and consensus
+       based colour scheme</li>
+   </ul>
+   <p><em>Major highlights of the 2.10.0 Release</em></p>
+   <ul>
      <li><strong>Ensembl sequence fetcher</strong><br />Annotated
        Genes, transcripts and proteins can be retrieved via Jalview's new
        <a href="features/ensemblsequencefetcher.html">Ensembl REST