Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge feature/JAL-3144noJTree
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 31 Oct 2018 16:30:24 +0000 (16:30 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 31 Oct 2018 16:30:24 +0000 (16:30 +0000)
commit181cd6607ecd631aa5972582ff1d99c5bea75b23
tree0bd2b3792b65f74467d765673ec00a385d075b74
parentc2763e1b13c4796b29b9d4c6deca52a769b42f79
parent0f0790d729a3265fc4bd1b08e61b9ba79a120c76
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge

Conflicts:
src/jalview/ext/ensembl/EnsemblRestClient.java
swingjs/timestamp
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/gui/AlignFrame.java
swingjs/timestamp
utils/eclipse/JalviewCodeStyle.xml