Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 Mar 2020 10:51:45 +0000 (11:51 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 Mar 2020 10:51:45 +0000 (11:51 +0100)
commit006890b02106eb31841e6e84d75f1027434823e0
tree4e54531a0eb494bb4489065204517ae25dfcd4de
parent20fde02b6f6f28396595d8a3b90fb48783da0b9e
parentaeb6256bd008584086db3c7be28bee2d42580e61
Merge branch 'develop' into Jalview-JS/develop

Conflicts:
.gitignore
build.gradle
gradle.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/JvSwingUtils.java
src/jalview/util/MessageManager.java
test/jalview/gui/AlignmentPanelTest.java
test/jalview/gui/JvSwingUtilsTest.java
test/jalview/gui/PopupMenuTest.java
utils/eclipse/org.eclipse.jdt.core.jalview.prefs
34 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/Cache.java
src/jalview/bin/Jalview.java
src/jalview/controller/AlignViewController.java
src/jalview/datamodel/Sequence.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/JvSwingUtils.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/Preferences.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/SplitFrame.java
src/jalview/io/FeaturesFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/project/Jalview2XML.java
src/jalview/util/MessageManager.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/dbsources/EmblXmlSource.java
test/jalview/analysis/CrossRefTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/gui/AlignmentPanelTest.java
test/jalview/gui/PopupMenuTest.java
test/jalview/io/CrossRef2xmlTests.java
test/jalview/io/vcf/VCFLoaderTest.java
utils/install4j/jalview_dmg_background_layers.pdf