Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 16 Jan 2019 11:50:22 +0000 (11:50 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 16 Jan 2019 11:50:22 +0000 (11:50 +0000)
commit1d6ce1bd2d0cf108d6207694e4aa6b845de11049
tree7a3d24f6e1f2a4153337ee5253ea8f7a5099a383
parentaab74f8748bf49bf6b17ba82f0bc5644d4dc2853
parent0d11e2fa31e8cdacb7424c546b952786e1ca538b
Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
JAL-3063 todo: add castor-1.1-cycle.jar back to libraries inorder to ensure VAMSAS functionality remains
src/jalview/project/Jalview2XML.java
test/jalview/gui/AlignFrameTest.java