source.jalview.org Git - jalview.git/commit

Merge branch 'kjvdh/features/PhylogenyViewer' into
kjvdh/features/PhylogenyViewerInterfaces

Conflicts:
src/jalview/ext/archaeopteryx/AptxFrame.java
src/jalview/ext/archaeopteryx/AptxInit.java
src/jalview/ext/archaeopteryx/AptxTreePanel.java
src/jalview/ext/archaeopteryx/JalviewBinding.java
src/jalview/ext/archaeopteryx/LoadedTreeSequenceAssociation.java
src/jalview/ext/archaeopteryx/Tree.java
src/jalview/ext/archaeopteryx/TreeNode.java
src/jalview/ext/treeviewer/ExternalTreeParserI.java
src/jalview/ext/treeviewer/ExternalTreeViewerFrameI.java

author	kjvdheide <kjvanderheide@dundee.ac.uk>
	Mon, 18 Dec 2017 15:37:19 +0000 (15:37 +0000)
committer	kjvdheide <kjvanderheide@dundee.ac.uk>
	Mon, 18 Dec 2017 15:46:55 +0000 (15:46 +0000)
commit	fffa60416174fe7a29bca9ea4c8b53d45a6e905c
tree	eee75baac1577aa4ecb54a5361191192b447faae	tree \| snapshot
parent	163acbff0a52f00ca79bd5eec693009738d1b370	commit \| diff
parent	94d4877b3d5988c15178a770bd0ebacedd4a9c40	commit \| diff

src/jalview/ext/archaeopteryx/AptxFrame.java	diff1 \|	\|	blob \| history
src/jalview/ext/archaeopteryx/AptxTreePanel.java	diff1 \|	\|	blob \| history
src/jalview/ext/archaeopteryx/JalviewBinding.java	diff1 \|	diff2 \|	blob \| history
src/jalview/ext/treeviewer/ExternalTreePanel.java	diff1 \|	\|	blob \| history