git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71d6099 b186dda)
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)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/io/StockholmFile.java patch | diff1 | diff2 | blob | history
src/jalview/renderer/AnnotationRenderer.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/io/StockholmFile.java
Simple merge