Merge branch 'develop' into bug/JAL-1841rnaSecStr
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Aug 2016 11:15:06 +0000 (12:15 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Aug 2016 11:15:06 +0000 (12:15 +0100)
commit0ca96db9937136626dcd867e122d1762b28e15bd
tree013f529529e2bd98119532b60c968f9f5e1d4355
parent71d6099d5246bdaf7b667e02620f403937582780
parentb186ddae1bf9d9ae8e61bc2a3c1854c13d21cc87
Merge branch 'develop' into bug/JAL-1841rnaSecStr
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/io/StockholmFile.java
src/jalview/renderer/AnnotationRenderer.java