From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 21 Nov 2017 10:27:55 +0000 (+0000)
Subject: Merge branch 'develop' into feature/JAL-2759
X-Git-Tag: Release_2_10_4~55^2~1^2~60
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d5702bf3268c2688e90d645ec635ad5bb5d3a76e;hp=d5702bf3268c2688e90d645ec635ad5bb5d3a76e;p=jalview.git

Merge branch 'develop' into feature/JAL-2759

Conflicts:
	benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
	src/jalview/gui/AlignViewport.java
---