From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 23 Mar 2017 09:17:31 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2393customMatrices
X-Git-Tag: Release_2_10_2~3^2~105^2~2^2~69
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=76c239505d13a123cc83621623aaca16e47ddb12;p=jalview.git

Merge branch 'develop' into features/JAL-2393customMatrices
---

76c239505d13a123cc83621623aaca16e47ddb12
diff --cc resources/lang/Messages_es.properties
index def3998,6b8761e..46fd4b5
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -1290,4 -1288,4 +1290,4 @@@ label.edit_sequence_url_link = Editar l
  warn.name_cannot_be_duplicate = Los nombres URL definidos por el usuario deben ser únicos y no pueden ser ids de MIRIAM
  label.invalid_name = Nombre inválido !
  label.output_seq_details = Seleccionar Detalles de la secuencia para ver todas
--label.urllinks = Enlaces
++label.urllinks = Enlaces
diff --cc src/jalview/appletgui/AlignViewport.java
index f204462,065c503..0dcd543
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@@ -299,10 -297,10 +297,10 @@@ public class AlignViewport extends Alig
  
    public void resetSeqLimits(int height)
    {
-     setEndSeq(height / getCharHeight());
+     ranges.setEndSeq(height / getCharHeight());
    }
  
 -  public void setCurrentTree(NJTree tree)
 +  public void setCurrentTree(TreeModel tree)
    {
      currentTree = tree;
    }