Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 27 Jun 2017 13:27:36 +0000 (14:27 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 27 Jun 2017 13:27:36 +0000 (14:27 +0100)
commitd065bc916cb63af83cdab7319f5177a855724aba
tree750c58cbbc264b51b2c24f869a7950c9f010116a
parentd346ed81a91c4fbed1836379bb794ed908cd9a11
parent2d3be0b3f26fa3e35480976cd5a90a5562d43dcf
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/appletgui/SeqPanel.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
13 files changed:
src/jalview/appletgui/APopupMenu.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/appletgui/SeqPanel.java
src/jalview/datamodel/Alignment.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/io/JSONFile.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/io/JSONFileTest.java