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
- [DH] .gitmodules
- [DH] _aptx_jalview_configuration_file.txt
- [DH] forester
- [DH] resources/lang/Messages.properties
- [DH] src/jalview/analysis/TreeAlgorithm.java
- [DH] src/jalview/analysis/TreeBuilder.java
- [DH] src/jalview/analysis/TreeCalculator.java
- [DH] src/jalview/analysis/TreeModel.java
- [DH] src/jalview/appletgui/OverviewPanel.java
- [DH] src/jalview/appletgui/PCAPanel.java
- [DH] src/jalview/appletgui/RedundancyPanel.java
- [DH] src/jalview/appletgui/TreePanel.java
- [DH] src/jalview/bin/Jalview.java
- [DH] src/jalview/ext/archaeopteryx/Aptx.java
- [DH] src/jalview/ext/archaeopteryx/AptxInit.java
- [DH] src/jalview/ext/archaeopteryx/AptxTreeBuilder.java
- [DH] src/jalview/ext/archaeopteryx/AptxTreePanel.java
- [DH] src/jalview/ext/archaeopteryx/JalviewBinding.java
- [DH] src/jalview/ext/archaeopteryx/LoadedTreeAssociation.java
- [DH] src/jalview/ext/archaeopteryx/Tree.java
- [DH] src/jalview/ext/archaeopteryx/TreeNode.java
- [DH] src/jalview/ext/forester/DataConversions.java
- [DH] src/jalview/ext/forester/ForesterMatrix.java
- [DH] src/jalview/ext/forester/io/SupportedTreeFileFilter.java
- [DH] src/jalview/ext/forester/io/TreeDatabaseMenuBuilder.java
- [DH] src/jalview/ext/forester/io/TreeParser.java
- [DH] src/jalview/ext/treeviewer/ExternalLoadedTreeAssociationI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeBuilderI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeNodeI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreePanelI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeParserI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeViewerBindingI.java
- [DH] src/jalview/ext/treeviewer/ExternalTreeViewerI.java
- [DH] src/jalview/fts/service/pdb/PDBFTSPanel.java
- [DH] src/jalview/gui/AlignFrame.java
- [DH] src/jalview/gui/AppJmol.java
- [DH] src/jalview/gui/CalculationChooser.java
- [DH] src/jalview/gui/ChimeraViewFrame.java
- [DH] src/jalview/gui/Console.java
- [DH] src/jalview/gui/Desktop.java
- [DH] src/jalview/gui/JalviewDialog.java
- [DH] src/jalview/gui/OverviewPanel.java
- [DH] src/jalview/gui/PaintRefresher.java
- [DH] src/jalview/gui/RedundancyPanel.java
- [DH] src/jalview/gui/StructureViewerBase.java
- [DH] src/jalview/gui/TreeCanvas.java
- [DH] src/jalview/gui/TreePanel.java
- [DH] src/jalview/gui/TreeParams.java
- [DH] src/jalview/gui/VamsasApplication.java
- [DH] src/jalview/gui/WebserviceInfo.java
- [DH] src/jalview/gui/WsPreferences.java
- [DH] src/jalview/io/BioJsHTMLOutput.java
- [DH] src/jalview/io/FileLoader.java
- [DH] src/jalview/io/NewickFile.java
- [DH] src/jalview/javascript/JSFunctionExec.java
- [DH] src/jalview/jbgui/GAlignFrame.java
- [DH] src/jalview/math/Matrix.java
- [DH] src/jalview/math/MatrixI.java
- [DH] src/jalview/util/AWTConsole.java
- [DH] src/jalview/util/MappingUtils.java
- [DH] src/jalview/viewmodel/AlignmentViewport.java
- [DH] src/jalview/ws/DBRefFetcher.java
- [DH] src/jalview/ws/jws1/Discoverer.java
- [DH] src/jalview/ws/jws2/Jws2Discoverer.java
- [DH] test/jalview/ext/archaeopteryx/AptxJalviewSequenceTreeTest.java
- [DH] test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java
- [DH] test/jalview/ext/archaeopteryx/TreeViewTest.java
- [DH] test/jalview/gui/FreeUpMemoryTest.java
- [DH] test/jalview/io/NewickFileTests.java
- [DH] utils/eclipse/org.eclipse.jdt.core.jalview.prefs