[med-svn] [figtree] 07/08: Merge tag 'upstream/1.4.2+dfsg'
Andreas Tille
tille at debian.org
Tue Dec 1 10:56:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository figtree.
commit 68664a6e8138f890a9d6e89c5a3955cf5d3652b8
Merge: c357823 8f2470a
Author: Andreas Tille <tille at debian.org>
Date: Tue Dec 1 11:25:32 2015 +0100
Merge tag 'upstream/1.4.2+dfsg'
Upstream version 1.4.2+dfsg
Graphics/CartoonTool.psd | Bin
Graphics/CollapseTool.png | Bin
Graphics/CollapseTool.psd | Bin
Graphics/Darwin's Tree.png | Bin
Graphics/FigTree.icns | Bin
Graphics/FigTreeDocIcon.icns | Bin
Graphics/FigTreeDocIcon.psd | Bin
Graphics/FigTreeDocIcon.tif | Bin
Graphics/FigTreeIcon.png | Bin
Graphics/FigTreeIcon.psd | Bin
Graphics/FigTreeIcon.tif | Bin
Graphics/FigTreeScreen.png | Bin
Graphics/RootingTool.psd | Bin
Graphics/polar_tree.pdf | 0
Graphics/radial_tree.pdf | Bin
Graphics/rect_tree.pdf | 0
build.xml | 32 ++++++++++-----------
release/Linux/icons/figtree.png | Bin
src/figtree/applet/FigTreeApplet.java | 10 +++----
src/figtree/application/ExportTreeDialog.java | 0
src/figtree/application/FigTreeApplication.java | 16 +++++------
src/figtree/application/FigTreeFrame.java | 0
src/figtree/application/FigTreeMenuBarFactory.java | 0
src/figtree/application/FigTreeNexusExporter.java | 0
src/figtree/application/FigTreeNexusImporter.java | 0
src/figtree/application/FigTreePDF.java | 0
src/figtree/application/FigTreePanel.java | 0
src/figtree/application/JSONTreeExporter.java | 0
src/figtree/application/images/actionButton.png | Bin
.../application/images/actionButtonInactive.png | Bin
.../application/images/actionButtonPressed.png | Bin
src/figtree/application/images/add.png | Bin
src/figtree/application/images/addButton.png | Bin
.../application/images/addButtonInactive.png | Bin
.../application/images/addButtonPressed.png | Bin
src/figtree/application/images/annotation.png | Bin
src/figtree/application/images/annotationTool.png | Bin
src/figtree/application/images/cartoonNodeTool.png | Bin
src/figtree/application/images/chartTool.png | Bin
.../application/images/collapseNodeTool.png | Bin
src/figtree/application/images/coloursTool.png | Bin
src/figtree/application/images/crosshairCursor.png | Bin
src/figtree/application/images/dataEditorTool.png | Bin
src/figtree/application/images/document.png | Bin
src/figtree/application/images/exportTool.png | Bin
src/figtree/application/images/figtree.png | Bin
.../application/images/filterBackground.png | Bin
src/figtree/application/images/find.png | Bin
src/figtree/application/images/findTool.png | Bin
src/figtree/application/images/fontBiggerTool.png | Bin
src/figtree/application/images/fontSmallerTool.png | Bin
src/figtree/application/images/import.png | Bin
src/figtree/application/images/infoTool.png | Bin
src/figtree/application/images/minus.png | Bin
src/figtree/application/images/nextButton.png | Bin
.../application/images/nextButtonInactive.png | Bin
.../application/images/nextButtonPressed.png | Bin
src/figtree/application/images/prefsAdvanced.png | Bin
src/figtree/application/images/prefsClipboard.png | Bin
src/figtree/application/images/prefsGeneral.png | Bin
src/figtree/application/images/previousButton.png | Bin
.../application/images/previousButtonInactive.png | Bin
.../application/images/previousButtonPressed.png | Bin
src/figtree/application/images/project.png | Bin
src/figtree/application/images/projectTool.png | Bin
src/figtree/application/images/publication.png | Bin
src/figtree/application/images/removeButton.png | Bin
.../application/images/removeButtonInactive.png | Bin
.../application/images/removeButtonPressed.png | Bin
src/figtree/application/images/rerootTool.png | Bin
src/figtree/application/images/rotateCursor.psd | Bin
src/figtree/application/images/rotateTool.png | Bin
src/figtree/application/images/statisticsTool.png | Bin
src/figtree/application/images/tableSelection.png | Bin
.../application/images/tableSelectionGray.png | Bin
src/figtree/application/menus/TreeMenuFactory.java | 0
src/figtree/application/menus/TreeMenuHandler.java | 0
.../preferences/AdvancedPreferencesSection.java | 0
.../preferences/AppearancePreferencesSection.java | 0
.../preferences/FontsPreferencesSection.java | 0
.../preferences/GeneralPreferencesSection.java | 0
src/figtree/panel/FigTreePanel.java | 0
src/figtree/panel/LabelPainterController.java | 0
src/figtree/panel/ScaleBarPainterController.java | 0
src/figtree/panel/SimpleLabelPainter.java | 0
src/figtree/panel/TreeAppearanceController.java | 0
src/figtree/panel/TreeColouringController.java | 0
src/figtree/panel/TreeLayoutController.java | 0
src/figtree/panel/TreeViewerController.java | 0
src/figtree/panel/TreesController.java | 0
src/figtree/treeviewer/AnnotationsController.java | 10 +++----
src/figtree/treeviewer/AnnotationsListener.java | 0
.../treeviewer/AttributeColourController.java | 0
.../treeviewer/ContinuousColourScaleDialog.java | 0
src/figtree/treeviewer/ContinuousScaleDialog.java | 0
src/figtree/treeviewer/DefaultTreeViewer.java | 10 -------
.../treeviewer/DiscreteColourScaleDialog.java | 0
src/figtree/treeviewer/ExtendedTreeViewer.java | 0
src/figtree/treeviewer/FindDialog.java | 0
src/figtree/treeviewer/FindPanel.java | 0
src/figtree/treeviewer/MultiPaneTreeViewer.java | 0
.../treeviewer/MultiPaneTreeViewerController.java | 0
.../treeviewer/MultipleTreesController.java | 0
.../treeviewer/OldContinuousColourScaleDialog.java | 0
src/figtree/treeviewer/ScaleAxis.java | 0
src/figtree/treeviewer/SizeScaleDialog.java | 0
src/figtree/treeviewer/TimeScale.java | 0
src/figtree/treeviewer/TimeScaleController.java | 0
.../treeviewer/TreeAppearanceController.java | 0
src/figtree/treeviewer/TreePane.java | 10 +------
src/figtree/treeviewer/TreePaneListener.java | 0
src/figtree/treeviewer/TreePaneRollOver.java | 0
src/figtree/treeviewer/TreePaneRuler.java | 0
src/figtree/treeviewer/TreePaneSelector.java | 0
src/figtree/treeviewer/TreeSelectionListener.java | 0
src/figtree/treeviewer/TreeViewer.java | 0
src/figtree/treeviewer/TreeViewerController.java | 0
src/figtree/treeviewer/TreeViewerListener.java | 0
src/figtree/treeviewer/TreeViewerPanel.java | 0
src/figtree/treeviewer/TreesController.java | 0
.../annotations/AnnotationDefinition.java | 0
.../annotations/AnnotationDefinitionsDialog.java | 0
.../treeviewer/annotations/AnnotationDialog.java | 0
.../annotations/DefineAnnotationDialog.java | 0
.../decorators/AttributableDecorator.java | 0
.../treeviewer/decorators/ColourDecorator.java | 0
.../treeviewer/decorators/CompoundDecorator.java | 0
.../decorators/ContinuousColourDecorator.java | 0
.../treeviewer/decorators/ContinuousScale.java | 0
.../decorators/ContinuousStrokeDecorator.java | 0
src/figtree/treeviewer/decorators/Decorator.java | 0
.../decorators/DiscreteColourDecorator.java | 0
.../DiversityContinuousColourDecorator.java | 0
.../decorators/HSBContinuousColourDecorator.java | 0
.../decorators/InterpolatingColourDecorator.java | 0
.../decorators/ParsimonyBranchDecorator.java | 0
src/figtree/treeviewer/images/polarTree.png | Bin
src/figtree/treeviewer/images/radialTree.png | Bin
src/figtree/treeviewer/images/rectangularTree.png | Bin
.../treeviewer/painters/AbstractPainter.java | 0
.../treeviewer/painters/BasicLabelPainter.java | 0
.../treeviewer/painters/CharactersPainter.java | 0
src/figtree/treeviewer/painters/LabelPainter.java | 0
.../painters/LabelPainterController.java | 0
src/figtree/treeviewer/painters/LegendPainter.java | 0
.../painters/LegendPainterController.java | 0
.../treeviewer/painters/NodeBarController.java | 0
.../treeviewer/painters/NodeBarPainter.java | 0
src/figtree/treeviewer/painters/NodePainter.java | 0
.../treeviewer/painters/NodeShapeController.java | 0
.../treeviewer/painters/NodeShapePainter.java | 0
src/figtree/treeviewer/painters/Painter.java | 0
.../treeviewer/painters/PainterListener.java | 0
.../treeviewer/painters/ScaleAxisPainter.java | 0
.../painters/ScaleAxisPainterController.java | 0
.../treeviewer/painters/ScaleBarPainter.java | 0
.../painters/ScaleBarPainterController.java | 0
.../treeviewer/painters/ScaleGridPainter.java | 0
src/figtree/treeviewer/painters/ScalePainter.java | 0
src/figtree/treeviewer/painters/StatesPainter.java | 0
.../treeviewer/treelayouts/AbstractTreeLayout.java | 0
.../treeviewer/treelayouts/PolarTreeLayout.java | 0
.../treelayouts/PolarTreeLayoutController.java | 0
.../treeviewer/treelayouts/RadialTreeLayout.java | 0
.../treelayouts/RadialTreeLayoutController.java | 0
.../treelayouts/RectilinearTreeLayout.java | 0
.../RectilinearTreeLayoutController.java | 0
src/figtree/treeviewer/treelayouts/TreeLayout.java | 0
.../treeviewer/treelayouts/TreeLayoutCache.java | 0
.../treeviewer/treelayouts/TreeLayoutListener.java | 0
src/figtree/ui/PercentFormat.java | 0
src/figtree/ui/RomanFormat.java | 0
172 files changed, 34 insertions(+), 54 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/figtree.git
More information about the debian-med-commit
mailing list