Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 May 2017 11:08:24 +0000 (12:08 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 May 2017 11:08:24 +0000 (12:08 +0100)
commitffa5c07d90b4a933762a5d9faa0578c11693d63a
tree2987160a87a46c9429af6e5eba4ef88d29a4b2d5
parent480d7b96f089281a3caf77d2a4e5adec09dc5bfa
parent962347ea6afb8dc4efb68ebc039f1c8bf62915e0
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/appletgui/SeqPanel.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/IdPanel.java
src/jalview/appletgui/SeqPanel.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/IdPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/Jalview2XML_V1.java
src/jalview/gui/SeqPanel.java