Merge branch 'develop' into features/JAL-2446NCList features/JAL-653_JAL-1766_htslib_refseqsupport
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Mar 2017 11:07:15 +0000 (11:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 21 Mar 2017 11:07:15 +0000 (11:07 +0000)
commita8a60500f1be9c3e02976f2193eb62ff5a302220
tree4b95fb67bdfb674ad59fdeb181b2c946cd3ce4f3
parent51728d3951398f9c12d7017c776953f17322cc68
parent84724ad7b25f65eb6009f70d9b4cb89fc6796622
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/datamodel/Sequence.java
src/jalview/gui/OverviewPanel.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/SeqCanvas.java