Merge branch 'Jalview-JS/develop' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 May 2020 09:59:52 +0000 (10:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 May 2020 09:59:52 +0000 (10:59 +0100)
commit65740880573a48adc758bec3939ece9d9ae104dd
tree71342cf4383fcdd0d5a3f373dab26044c5a40b6e
parent71aa78b8a7d54e5aeb6b278310dfd735efb77477
parent26f79fac447ccf6235bbf52992455f0a2bc6cbcd
Merge branch 'Jalview-JS/develop' into develop

Conflicts:
build.gradle
src/jalview/gui/PopupMenu.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/util/DBRefUtils.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
20 files changed:
src/jalview/appletgui/APopupMenu.java
src/jalview/datamodel/features/FeatureAttributes.java
src/jalview/ext/ensembl/EnsemblInfo.java
src/jalview/ext/ensembl/EnsemblMap.java
src/jalview/gui/APQHandlers.java
src/jalview/gui/IdPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
src/jalview/io/BackupFiles.java
src/jalview/io/FeaturesFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/io/vcf/VCFLoader.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/util/DBRefUtils.java
src/jalview/util/JSONUtils.java
src/jalview/util/ShortcutKeyMaskExWrapper.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/util/DBRefUtilsTest.java