Merge branch 'develop' into features/JAL-2393customMatrices
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 7 Apr 2017 13:16:55 +0000 (14:16 +0100)
commit567c2595554096f10feab130153f97286f3f7d80
tree9ce8fa4e6a01fd53288b129a9d7edb00504f4873
parenta5ce354ec7cb56712e6ee00f5e0fea326bb4c9ec
parent33984e02c5687dc011d13da4b17cb0815970e0f5
Merge branch 'develop' into features/JAL-2393customMatrices
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/jbgui/GAlignFrame.java