Merge branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalvi...
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Nov 2014 15:49:20 +0000 (15:49 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 14 Nov 2014 15:49:20 +0000 (15:49 +0000)
commit49a7daf06cb98b45ce2d33ea25b15172c4204dda
treef488bd42395f48f673023ab5a599ac5f208580ff
parent227ee1c1c69c228b67d408a0a83ae51bf5811272
parenta19b4b2a4000dbfe90a77b59bfecb10745d2d753
Merge branch 'features/JAL-1541_BioJsMSAViewer-export-option' of https://source.jalview.org/git/jalview.git into features/JAL-1541_BioJsMSAViewer-export-option

Conflicts:
src/jalview/gui/AlignViewport.java
.externalToolBuilders/Jalview Release indices [Builder].launch
.settings/org.eclipse.jdt.core.prefs
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java