Merge branch 'kjvdh/features/PhylogenyViewer' of
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 17 Nov 2017 13:34:22 +0000 (13:34 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 17 Nov 2017 13:34:22 +0000 (13:34 +0000)
commit91bea2a1185e438bfd52fc1848cf615068016192
tree91af12e56aac3ce7799758b1634a2a918ce11793
parent7907e8826153967e245c409b3fc39876f92fb53b
parent7bf767decd23672a1b5eb67974c99f58c54f788f
Merge branch 'kjvdh/features/PhylogenyViewer' of
https://source.jalview.org/git/jalview.git into
kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/ext/archaeopteryx/AptxBinding.java
src/jalview/ext/forester/io/ExternalTreeParserI.java
src/jalview/ext/forester/io/ForesterTreeParser.java
15 files changed:
_aptx_jalview_configuration_file.txt
forester
src/jalview/ext/archaeopteryx/Aptx.java
src/jalview/ext/archaeopteryx/AptxInit.java
src/jalview/ext/archaeopteryx/AptxTreeBuilder.java
src/jalview/ext/archaeopteryx/AptxTreePanel.java
src/jalview/ext/archaeopteryx/JalviewBinding.java
src/jalview/ext/archaeopteryx/LoadedTreeAssociation.java
src/jalview/ext/forester/io/TreeParser.java
src/jalview/ext/treeviewer/ExternalTreeParserI.java
src/jalview/ext/treeviewer/ExternalTreeViewerI.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
test/jalview/ext/archaeopteryx/AptxJalviewSequenceTreeTest.java
test/jalview/ext/archaeopteryx/AptxPhylogenyTreeTest.java