Merge branch 'develop' into bug/JAL-2609attemptedmerge
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 19 Oct 2017 13:14:59 +0000 (14:14 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 19 Oct 2017 13:14:59 +0000 (14:14 +0100)
commit02d91bab6246aa621844864b2351bbe1ed3905f6
tree2009cf507c2869eeebd244731c0c113e37840af5
parent4fe95a3bc0c1aff8782a62c830215c1188aed7ae
parentc4a72d18f6a7b2cf3de4a46b7a35cbfd0d76438f
Merge branch 'develop' into bug/JAL-2609attemptedmerge
src/jalview/gui/SeqPanel.java