Merge branch 'releases/Release_2_10_4_Branch' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 7 Mar 2018 14:40:59 +0000 (14:40 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 7 Mar 2018 14:40:59 +0000 (14:40 +0000)
commit948bd3bcbacc509da0cefaae3eedd97300a6ccce
treee3c2ac172a531d31e9a325a82fd16f3119ac5df7
parent3699e0fd64de573799a6cd2fd78da5dfc670d98e
parenta2703f9c2948fba9747b304fed02b7bbc5d32b37
Merge branch 'releases/Release_2_10_4_Branch' into develop
check carefully that JAL-2885 (configurable Ensembl/Genomes Endpoints) functionality is still present
22 files changed:
build.xml
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/Dna.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/ext/ensembl/EnsemblInfo.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
src/jalview/util/MappingUtils.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/gui/AlignFrameTest.java
test/jalview/gui/PopupMenuTest.java
test/jalview/util/MappingUtilsTest.java