Merge branch 'develop' into bug/JAL-1608createGroups
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 29 Mar 2017 15:36:03 +0000 (16:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 29 Mar 2017 15:36:03 +0000 (16:36 +0100)
commitc437fc72420baf7b045d417fb6cabcebe87987c5
treeb77bea10f932ebd76b57fbfc7a45d0b0e8f84fe6
parentede54837349adde8f7265c6d8fa58d14165ee215
parentd7fd122bbdef3ab11f43ed6058fe37872d1d368e
Merge branch 'develop' into bug/JAL-1608createGroups
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java