Merge branch 'releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 May 2018 13:59:27 +0000 (14:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 7 May 2018 13:59:27 +0000 (14:59 +0100)
commit9f1f7839cfd50555efd3af1ff4102348f950c563
treeda7b55259756d24caf13faee5556e7f9b21a73d7
parente34a4c5332c2d4d92651e0adc99ab7c5d262d13b
parent797a5cffdb1e932a419094a828ad3ccf4c3e5568
Merge branch 'releases/Release_2_10_4_Branch' into develop

Conflicts:
.classpath
.classpath
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/Desktop.java
src/jalview/gui/SeqPanel.java
src/jalview/util/MapList.java
test/jalview/io/Jalview2xmlTests.java
test/jalview/util/MapListTest.java