Merge branch 'develop' into JAL-1483_featureBasedTreeCalc
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 14 Nov 2014 12:16:32 +0000 (12:16 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 14 Nov 2014 12:16:32 +0000 (12:16 +0000)
commit497958b4e5217efaa3ddeece38f38c3a6e98cb96
tree8ad445a1fb94b9ad681bf22038008bc9de3b6626
parenteb244ec04ea14b024ec6b20ecf7a9e636ca57134
parent70fd4c40d0b2046c6d402e365e4d04f9cfbb68ef
Merge branch 'develop' into JAL-1483_featureBasedTreeCalc

Conflicts:
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
src/jalview/ws/AWSThread.java
30 files changed:
src/jalview/api/AlignViewControllerI.java
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/AppletJmol.java
src/jalview/appletgui/FeatureRenderer.java
src/jalview/appletgui/FeatureSettings.java
src/jalview/appletgui/SeqPanel.java
src/jalview/bin/JalviewLite.java
src/jalview/controller/AlignViewController.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationExporter.java
src/jalview/gui/AppJmol.java
src/jalview/gui/ChimeraViewFrame.java
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/IdPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
src/jalview/io/HTMLOutput.java
src/jalview/schemes/AnnotationColourGradient.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
src/jalview/ws/AWSThread.java