Merge branch 'develop' into features/mchmmer
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 8 May 2018 09:33:48 +0000 (10:33 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 8 May 2018 09:33:48 +0000 (10:33 +0100)
commitff6e13326784845c9de552a7acd4b8dcd9a68952
treec28d86c2ae7e7b8dec87352d205e490dda03a290
parente13faf21ee1dfe1f5dec75df9ef4dc42372b67b7
parent61c3a37345ca86ac9a7cb5c47f685b212b72d91d
Merge branch 'develop' into features/mchmmer
help/help.jhm
help/helpTOC.xml
help/html/features/preferences.html
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
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