Merge branch 'develop' into features/JAL-2110_crossRefDuplications
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 29 Jun 2016 10:36:16 +0000 (11:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 29 Jun 2016 10:36:16 +0000 (11:36 +0100)
1  2 
src/jalview/gui/Jalview2XML.java

Simple merge