Merge branch 'feature/JAL-2488finalize' into develop

author Jim Procter <jprocter@issues.jalview.org>

Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)

committer Jim Procter <jprocter@issues.jalview.org>

Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)
author Jim Procter <jprocter@issues.jalview.org>
Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)
committer Jim Procter <jprocter@issues.jalview.org>
Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)
diff --cc src/jalview/appletgui/AlignViewport.java
Simple merge
diff --cc src/jalview/appletgui/AlignmentPanel.java
Simple merge
diff --cc src/jalview/controller/AlignViewController.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc src/jalview/gui/TreePanel.java
Simple merge
author	Jim Procter <jprocter@issues.jalview.org>
	Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)
committer	Jim Procter <jprocter@issues.jalview.org>
	Thu, 26 Oct 2017 15:26:06 +0000 (16:26 +0100)
		1	2
src/jalview/appletgui/AlignViewport.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/AlignmentPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/controller/AlignViewController.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Jalview2XML.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/TreePanel.java	patch \|	diff1 \|	diff2 \|	blob \| history