Merge branch 'feature/JAL-3063JAXB' into Jalview-BH/JAL-3026-JAL-3063-JAXB
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Oct 2018 15:52:01 +0000 (16:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Oct 2018 15:52:01 +0000 (16:52 +0100)
commitfab0afc9e1e7a5ca460f0cbd48545536f989a435
tree9fd64e5de417ca1af404149387651b5d582a594f
parentb7e521af667bdc18f9071075d1face56367eab69
parentd30a1e3993c5538efdecd3149dc8e5a1e4e42936
Merge branch 'feature/JAL-3063JAXB' into Jalview-BH/JAL-3026-JAL-3063-JAXB
22 files changed:
.classpath
README
build.xml
src/jalview/analysis/Conservation.java
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/TreeCanvas.java
src/jalview/gui/TreePanel.java
src/jalview/gui/UserDefinedColours.java
src/jalview/gui/WsParamSetManager.java
src/jalview/io/FileFormat.java
src/jalview/io/FileLoader.java
src/jalview/io/JalviewFileChooser.java
src/jalview/jbgui/GDesktop.java