Merge branch 'develop' into features/JAL-2446NCList
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 May 2017 09:33:32 +0000 (10:33 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 May 2017 09:33:32 +0000 (10:33 +0100)
commitb94e9d2b3e667c6925e3e40bac63de219fc717a7
treed24709f82bc4f7154c25a8798ae136fe24a58630
parentc63940e40edf030d8bb76d41fbd6b56331046427
parent3b239d86dc3a1bf3aa07c0ad3d38aeca57b54ada
Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
src/jalview/appletgui/SeqPanel.java
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java