Merge branch 'Release_2_8_2_Branch' into merge_r282_dev
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 27 Oct 2014 13:39:38 +0000 (13:39 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 27 Oct 2014 13:39:38 +0000 (13:39 +0000)
commitdefbcc5ef50f2287ea40d4a196495ba33b986eb7
tree0ae8304e2d90739949837f3ec8046505064c2b77
parent3b20366969476761c4756c0d19789953a66f26af
parent9493ac8f3b6a02d3cf9747ed6c0d6cf407d284e8
Merge branch 'Release_2_8_2_Branch' into merge_r282_dev
normalised HTML messages and line endings for JAL-1420 JAL-1428 JAL-1355
(darolmar commits)
Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/OptsAndParamsPage.java
src/jalview/gui/TextColourChooser.java
src/jalview/jbgui/GRestServiceEditorPane.java