Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

author gmungoc <g.m.carstairs@dundee.ac.uk>

Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)

committer gmungoc <g.m.carstairs@dundee.ac.uk>

Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/bin/Jalview.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/FeatureSettings.java
Simple merge
diff --cc src/jalview/gui/FeatureTypeSettings.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
		1	2
resources/lang/Messages.properties	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/Messages_es.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/bin/Jalview.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/FeatureSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/FeatureTypeSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history