Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:52:40 +0000 (08:52 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Jun 2017 07:52:40 +0000 (08:52 +0100)
commitf41d78dbf890fbb7597f75019d05841312fa4f52
tree66e327d6f09679f7f7364e8286215fbfcae976cf
parenta919f3bb2e42a605c71e434ef873dafddf2a2ae2
parent7abcbfb6619828a810ed1a9dddd870f70bf8bcd1
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/gui/PopupMenu.java
test/jalview/datamodel/SequenceTest.java