Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212
authorJim Procter <jprocter@issues.jalview.org>
Tue, 13 Aug 2019 15:22:01 +0000 (16:22 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 13 Aug 2019 15:22:01 +0000 (16:22 +0100)
commit6398c0217546a4d6943f63f670c2684c7c7274be
treeed7f56874c5e396418e67ba29ae4c3e3562e4732
parent9b85e1552fa57f02cf6cd312cfbd7efdfd079ea3
parent07ef1ecf0c1469c5461ed18a1093a95e88a3f59e
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into merge-212
14 files changed:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/PopupMenu.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/project/Jalview2XML.java
src/jalview/util/MapList.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/gui/AlignFrameTest.java
test/jalview/gui/PopupMenuTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java