From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 17 Jan 2017 13:31:55 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2360colourSchemeApplicability
X-Git-Tag: Release_2_10_3b1~357^2~16^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ca0a70b02a67f842a195319414d241ffa336656b;hp=ca0a70b02a67f842a195319414d241ffa336656b;p=jalview.git

Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
	src/jalview/gui/PopupMenu.java
	src/jalview/jbgui/GAlignFrame.java
---