Merge branch 'features/JAL-1469_svg-output-for-figure-export' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:46:06 +0000 (16:46 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:46:06 +0000 (16:46 +0000)
commit70fd4c40d0b2046c6d402e365e4d04f9cfbb68ef
tree4587bba99e41a7f79956bc2cf23e813ea9e1e3db
parentca58200ab4b0ab5883760460410d07959aeaf58e
parentcd825bdd232c02d63946d261da17c176622c50f0
Merge branch 'features/JAL-1469_svg-output-for-figure-export' into develop

Conflicts:
.classpath
.gitignore
src/jalview/gui/AlignmentPanel.java
src/jalview/jbgui/GAlignFrame.java
.classpath
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AppJmol.java
src/jalview/jbgui/GAlignFrame.java
utils/InstallAnywhere/Jalview.iap_xml