From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 13 Nov 2014 16:38:00 +0000 (+0000)
Subject: Merge branch 'features/JAL-1469_svg-output-for-figure-export' into Release_2_8_2_Branch
X-Git-Tag: Release_2_8_2b1^2~34
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e26efc02d16dcec0ef8b96571ff2a785fcb08f12;p=jalview.git

Merge branch 'features/JAL-1469_svg-output-for-figure-export' into Release_2_8_2_Branch

Conflicts:
	.gitignore
	src/jalview/gui/AlignmentPanel.java
---

e26efc02d16dcec0ef8b96571ff2a785fcb08f12