Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Apr 2020 17:54:49 +0000 (18:54 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Apr 2020 17:54:49 +0000 (18:54 +0100)
commit3609d4b908fa64cab35f2348401baab3347188fc
treea2279104b3d401071b518df20b616843caed97dd
parent2eea4e73351d902cd88923d863e9780fa57a0ee7
parenteda1adb8ef48c7c0da70635db7253a7489335603
Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha
update for 2.11.1 release
43 files changed:
help/help/help.jhm
help/help/helpTOC.xml
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/Jalview.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/Desktop.java
src/jalview/gui/EditNameDialog.java
src/jalview/gui/JvSwingUtils.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/Preferences.java
src/jalview/gui/RestInputParamEditDialog.java
src/jalview/gui/SplitFrame.java
src/jalview/gui/UserQuestionnaireCheck.java
src/jalview/gui/WsPreferences.java
src/jalview/io/AlignmentFileReaderI.java
src/jalview/io/AlignmentFileWriterI.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/jbgui/GCutAndPasteTransfer.java
src/jalview/jbgui/GPreferences.java
src/jalview/project/Jalview2XML.java
src/jalview/util/StringUtils.java
src/jalview/ws/rest/clientdefs/ShmrRestClient.java
test/jalview/analysis/AlignmentGenerator.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/datamodel/SequenceTest.java
test/jalview/gui/AlignViewportTest.java
test/jalview/gui/PairwiseAlignmentPanelTest.java
test/jalview/gui/PopupMenuTest.java
test/jalview/io/StockholmFileTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/OverviewResColourFinderTest.java
test/jalview/renderer/ResidueColourFinderTest.java
test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
test/jalview/util/StringUtilsTest.java