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)
Conflicts:
src/jalview/appletgui/SeqPanel.java

1  2 
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/SeqPanel.java

Simple merge
Simple merge