Merge branch 'develop' into bug/JAL-1841rnaSecStr
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Aug 2016 15:33:06 +0000 (16:33 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 18 Aug 2016 15:33:06 +0000 (16:33 +0100)
commit71d6099d5246bdaf7b667e02620f403937582780
tree6943462f4b96b37cfa6dd5da027b777972056652
parentb73ee7116faf97c00125fc8db7292ccde378d08e
parenteb712aa29e2bc62c57b90df8420052293dd90c6b
Merge branch 'develop' into bug/JAL-1841rnaSecStr
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AnnotationPanel.java
src/jalview/gui/AnnotationPanel.java