Merge branch 'features/JAL-1469_svg-output-for-figure-export' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:38:00 +0000 (16:38 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:38:00 +0000 (16:38 +0000)
commite26efc02d16dcec0ef8b96571ff2a785fcb08f12
tree0e653f4387b108a91268c92af9fe9db73f877372
parent1997c877936cb98c399c8eeb5790cd349a9f59b4
parentcd825bdd232c02d63946d261da17c176622c50f0
Merge branch 'features/JAL-1469_svg-output-for-figure-export' into Release_2_8_2_Branch

Conflicts:
.gitignore
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/jbgui/GAlignFrame.java