From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 12 Feb 2016 14:11:34 +0000 (+0000)
Subject: Merge branch 'develop' into
X-Git-Tag: Release_2_10_0~296^2~35
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7c77aedd3c547a20737d29019776d1f812b76662;p=jalview.git

Merge branch 'develop' into
features/JAL-653_JAL-1766_htslib_refseqsupport

Conflicts:
	resources/lang/Messages.properties
	src/jalview/gui/FeatureColourChooser.java
---

7c77aedd3c547a20737d29019776d1f812b76662
diff --cc resources/lang/Messages.properties
index a33b810,e428989..c4d1098
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1284,3 -1282,6 +1284,7 @@@ exception.pdb_server_unreachable = Jalv
  label.nw_mapping = Needleman & Wunsch Alignment
  label.sifts_mapping = SIFTs Mapping
  label.mapping_method = Sequence \u27f7 Structure mapping method
++label.mapping_method = Sequence \u27f7 Structure mapping method
+ status.waiting_for_user_to_select_output_file = Waiting for user to select {0} file.
+ status.cancelled_image_export_operation = Cancelled {0} export operation.
+ info.error_creating_file = Error creating {0} file.