From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 30 May 2017 09:33:32 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~224
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=b94e9d2b3e667c6925e3e40bac63de219fc717a7

Merge branch 'develop' into features/JAL-2446NCList

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

b94e9d2b3e667c6925e3e40bac63de219fc717a7