Merge branch 'develop' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 12 Feb 2016 14:11:34 +0000 (14:11 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 12 Feb 2016 14:11:34 +0000 (14:11 +0000)
commit7c77aedd3c547a20737d29019776d1f812b76662
treec9682285391269d268911d64896f312b6906b604
parent40adaea88739e0535914a278b141dc68f27f79ce
parent25217bbd06c4435ad995fd8ddf3620c3b1d68cd3
Merge branch 'develop' into
features/JAL-653_JAL-1766_htslib_refseqsupport

Conflicts:
resources/lang/Messages.properties
src/jalview/gui/FeatureColourChooser.java
resources/lang/Messages.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java