Merge branch 'develop' into features/JAL-2393customMatrices

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

Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)

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

Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc src/jalview/jbgui/GAlignFrame.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
		1	2
resources/lang/Messages.properties	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/Messages_es.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Jalview2XML.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/jbgui/GAlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history