Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh...
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 2 Jun 2022 15:05:51 +0000 (16:05 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 2 Jun 2022 15:05:51 +0000 (16:05 +0100)
commitf96e6a945e2df8a844f428c08cfc08210d937fc0
tree1d5e247a27894e812bc7a7dc23f6f6dfa98de563
parent11346f873e4ecb2d191499fd1d52b8de07a65bf3
parent62f2ed464010270830afcfe954647a51dfb5114b
Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh/features/PhylogenyViewer_tabbedsupport
Update from Release 2.11.2 develop branch JAL-1953
 Conflicts:
.classpath
.project
resources/lang/Messages.properties
src/jalview/bin/Jalview.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/fts/core/GFTSPanel.java
src/jalview/fts/service/pdb/PDBFTSPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/DasSourceBrowser.java
src/jalview/gui/Desktop.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SplashScreen.java
src/jalview/gui/StructureViewerBase.java
src/jalview/gui/TreePanel.java
src/jalview/gui/WebserviceInfo.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/FileLoader.java
src/jalview/io/HtmlSvgOutput.java
src/jalview/io/NewickFile.java
src/jalview/math/Matrix.java
src/jalview/math/MatrixI.java
src/jalview/util/MappingUtils.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/DasSequenceFeatureFetcher.java
src/jalview/ws/jws2/Jws2Discoverer.java
utils/eclipse/org.eclipse.jdt.core.jalview.prefs
utils/eclipse/org.eclipse.jdt.ui.prefs
38 files changed:
resources/lang/Messages.properties
src/jalview/analysis/TreeModel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/appletgui/PCAPanel.java
src/jalview/appletgui/TreePanel.java
src/jalview/bin/Jalview.java
src/jalview/fts/service/pdb/PDBFTSPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AppJmol.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/Console.java
src/jalview/gui/Desktop.java
src/jalview/gui/JalviewDialog.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/PaintRefresher.java
src/jalview/gui/RedundancyPanel.java
src/jalview/gui/StructureViewerBase.java
src/jalview/gui/TreeCanvas.java
src/jalview/gui/TreePanel.java
src/jalview/gui/VamsasApplication.java
src/jalview/gui/WebserviceInfo.java
src/jalview/gui/WsPreferences.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/FileLoader.java
src/jalview/io/NewickFile.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/math/Matrix.java
src/jalview/math/MatrixI.java
src/jalview/util/AWTConsole.java
src/jalview/util/MappingUtils.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/jws1/Discoverer.java
src/jalview/ws/jws2/Jws2Discoverer.java
test/jalview/gui/FreeUpMemoryTest.java
test/jalview/io/NewickFileTests.java
utils/eclipse/org.eclipse.jdt.core.jalview.prefs