Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 8 Oct 2019 09:49:13 +0000 (10:49 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 8 Oct 2019 09:49:13 +0000 (10:49 +0100)
commit0b573ed90b14079f7326281f50c0c9cffdace586
tree7601e42e8335c33bec20cf2ed7ae0b1933fd5a74
parent85f6e96380285dfda463cd36317c55c4f5184ad8
parent8c0019f5e35dcfdb8014f280ba1193db239c92dd
Merge branch 'develop' into Jalview-JS/develop

Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/CrossRef.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/PopupMenu.java
34 files changed:
.classpath
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/CrossRef.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SeqPanel.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/features/FeatureAttributes.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationExporter.java
src/jalview/gui/CrossRefAction.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/IdCanvas.java
src/jalview/gui/IdPanel.java
src/jalview/gui/OverviewCanvas.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/io/FeaturesFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/jbgui/GPreferences.java
src/jalview/project/Jalview2XML.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/gui/PopupMenuTest.java
test/jalview/io/vcf/VCFLoaderTest.java
test/jalview/project/Jalview2xmlTests.java